* 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
+7 -10
View File
@@ -39,10 +39,6 @@ RenderView::RenderView(BRect frame)
RenderView::~RenderView() RenderView::~RenderView()
{ {
_StopRenderThread(); _StopRenderThread();
if (fRenderThread >= 0)
wait_for_thread(fRenderThread, NULL);
_DeleteScene(); _DeleteScene();
} }
@@ -62,10 +58,9 @@ RenderView::AttachedToWindow()
uint32 uint32
RenderView::_CreateRenderThread() RenderView::_CreateRenderThread()
{ {
fRenderThread = spawn_thread(RenderView::_RenderThreadEntry, fRenderThread = spawn_thread(RenderView::_RenderThreadEntry, "renderThread",
"renderThread", B_NORMAL_PRIORITY, this);
B_NORMAL_PRIORITY,
this);
if (fRenderThread < 0) if (fRenderThread < 0)
return fRenderThread; return fRenderThread;
@@ -79,6 +74,9 @@ RenderView::_StopRenderThread()
LockGL(); LockGL();
fStopRendering = true; fStopRendering = true;
UnlockGL(); UnlockGL();
if (fRenderThread >= 0)
wait_for_thread(fRenderThread, NULL);
} }
@@ -178,10 +176,9 @@ RenderView::_CreateScene()
Quaternion(0, 0, 0, 1), 4.0f * timeSpacing); Quaternion(0, 0, 0, 1), 4.0f * timeSpacing);
fMeshInstances.push_back(instance); fMeshInstances.push_back(instance);
mesh->ReleaseReference(); mesh->ReleaseReference();
texture->ReleaseReference();
fMainCamera = new Camera(Vector3(0, 0, 0), Quaternion(0, 0, 0, 1), 50); fMainCamera = new Camera(Vector3(0, 0, 0), Quaternion(0, 0, 0, 1), 50);
texture->ReleaseReference();
} }
+6
View File
@@ -32,3 +32,9 @@ Texture::Id()
{ {
return fId; return fId;
} }
void
Texture::Update(float dt)
{
}
+1 -1
View File
@@ -20,7 +20,7 @@ public:
GLuint Id(); GLuint Id();
virtual void Update(float dt) {}; virtual void Update(float dt);
protected: protected:
GLuint fId; GLuint fId;