* Style fixes

* Moved the wait_for_thread in _StopRenderThread()


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32069 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexandre Deckner 2009-08-03 10:55:13 +00:00
parent 1c992a5285
commit 3d65021d98
5 changed files with 53 additions and 50 deletions

View File

@ -39,10 +39,6 @@ RenderView::RenderView(BRect frame)
RenderView::~RenderView()
{
_StopRenderThread();
if (fRenderThread >= 0)
wait_for_thread(fRenderThread, NULL);
_DeleteScene();
}
@ -62,10 +58,9 @@ RenderView::AttachedToWindow()
uint32
RenderView::_CreateRenderThread()
{
fRenderThread = spawn_thread(RenderView::_RenderThreadEntry,
"renderThread",
B_NORMAL_PRIORITY,
this);
fRenderThread = spawn_thread(RenderView::_RenderThreadEntry, "renderThread",
B_NORMAL_PRIORITY, this);
if (fRenderThread < 0)
return fRenderThread;
@ -79,6 +74,9 @@ RenderView::_StopRenderThread()
LockGL();
fStopRendering = true;
UnlockGL();
if (fRenderThread >= 0)
wait_for_thread(fRenderThread, NULL);
}
@ -178,10 +176,9 @@ RenderView::_CreateScene()
Quaternion(0, 0, 0, 1), 4.0f * timeSpacing);
fMeshInstances.push_back(instance);
mesh->ReleaseReference();
texture->ReleaseReference();
fMainCamera = new Camera(Vector3(0, 0, 0), Quaternion(0, 0, 0, 1), 50);
texture->ReleaseReference();
}
@ -200,7 +197,7 @@ void
RenderView::_UpdateViewport()
{
if (fNextRes != fRes && fNextRes.x >= 1.0 && fNextRes.y >= 1.0) {
glViewport(0, 0, (GLint)fNextRes.x + 1, (GLint)fNextRes.y + 1);
glViewport(0, 0, (GLint) fNextRes.x + 1, (GLint) fNextRes.y + 1);
fRes = fNextRes;
_UpdateCamera();
}

View File

@ -32,3 +32,9 @@ Texture::Id()
{
return fId;
}
void
Texture::Update(float dt)
{
}

View File

@ -20,7 +20,7 @@ public:
GLuint Id();
virtual void Update(float dt) {};
virtual void Update(float dt);
protected:
GLuint fId;