random-mirrors/librw
1
0
Fork 0
mirror of https://github.com/aap/librw.git synced 2025-12-23 02:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

worked on error handling

Browse Source
This commit is contained in:
aap
2016-06-17 13:29:49 +02:00
parent 6e71e34933
commit 1bb17b3094
8 changed files with 298 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/camera.cpp
View File

@@ -15,9 +15,9 @@ Camera*
Camera::create(void)
{
Camera *cam = (Camera*)malloc(PluginBase::s_size);
if(cam == NULL){
if(cam == nil){
RWERROR((ERR_ALLOC, PluginBase::s_size));
return NULL;
return nil;
}
cam->object.object.init(Camera::ID, 0);
cam->viewWindow.set(1.0f, 1.0f);
@@ -26,7 +26,7 @@ Camera::create(void)
cam->farPlane = 10.0f;
cam->fogPlane = 5.0f;
cam->projection = Camera::PERSPECTIVE;
cam->clump = NULL;
cam->clump = nil;
cam->inClump.init();
cam->constructPlugins();
return cam;
@@ -36,8 +36,8 @@ Camera*
Camera::clone(void)
{
Camera *cam = Camera::create();
if(cam == NULL)
return NULL;
if(cam == nil)
return nil;
cam->object.object.copy(&this->object.object);
cam->setFrame(this->getFrame());
cam->viewWindow = this->viewWindow;
@@ -72,9 +72,9 @@ Camera*
Camera::streamRead(Stream *stream)
{
CameraChunkData buf;
if(!findChunk(stream, ID_STRUCT, NULL, NULL)){
if(!findChunk(stream, ID_STRUCT, nil, nil)){
RWERROR((ERR_CHUNK, "STRUCT"));
return NULL;
return nil;
}
stream->read(&buf, sizeof(CameraChunkData));
Camera *cam = Camera::create();
@@ -84,9 +84,10 @@ Camera::streamRead(Stream *stream)
cam->farPlane = buf.farPlane;
cam->fogPlane = buf.fogPlane;
cam->projection = buf.projection;
cam->streamReadPlugins(stream);
return cam;
if(cam->streamReadPlugins(stream))
return cam;
cam->destroy();
return nil;
}
bool