* relatively decent lighting now

* added functionality to pilot
fiezi · Apr 5, 2012 · d64c47f · d64c47f
1 parent f3e0b73
commit d64c47f
Show file tree

Hide file tree

Showing 23 changed files with 473 additions and 119 deletions.
diff --git a/Moviesandbox.exe b/Moviesandbox.exe
diff --git a/classes/cameraActor.cpp b/classes/cameraActor.cpp
@@ -79,6 +79,13 @@ void CameraActor::update(double deltaTime){
         setLocation(location);
     }
 
+    //TODO: hack to make Cameras disappear!
+    if (Control::bRunning)
+        drawType=DRAW_NULL;
+    else
+        drawType=DRAW_VBOMESH;
+
+
     Actor::update(deltaTime);
 }
 

diff --git a/classes/control.cpp b/classes/control.cpp
@@ -116,10 +116,13 @@ void Control::startMovie(){
 
 bRunning=!bRunning;
 
-if (bRunning)
-	start();
-else
-	stop();
+    if (bRunning)
+        start();
+    else{
+        stop();
+        sceneData->controller->controlledActor=sceneData->controller;
+    }
+
 }
 
 

diff --git a/classes/drawTool.cpp b/classes/drawTool.cpp
@@ -93,6 +93,11 @@ void DrawTool::stop(){
     //switch to vboMesh drawing mode
     brush->drawing->drawType=DRAW_VBOMESH;
 
+    //make sure we are resetting the drawing to be pickable (after importing a .tga file for example)
+    brush->drawing->bPickable=true;
+    brush->drawing->bZTest=true;
+    brush->drawing->bZWrite=true;
+
     //forget our drawing!
     brush->drawing=NULL;
 

diff --git a/classes/importBitmapButton.cpp b/classes/importBitmapButton.cpp
@@ -163,7 +163,7 @@ void ImportBitmapButton::assembleImage(FIBITMAP* myBitmap, int imageWidth, int i
                 ((DrawTool*)sceneData->controller->currentTool)->paint();
 
             ///fill holes
-            /*
+
                 float myDepth=(float)myColor->rgbReserved;
                 float fillStep=1.0;
 
@@ -188,11 +188,11 @@ void ImportBitmapButton::assembleImage(FIBITMAP* myBitmap, int imageWidth, int i
 
                 if (fillDepth + fillStep/32.0f <myDepth){
                     int i=1;
-                    while    if (!sceneData->brush->drawing){
-        sceneData->makeWarningPopUp("No drawing! \n please place a drawing first!", this);
-        return;
-    }
- (fillDepth<myDepth){
+                     if (!sceneData->brush->drawing){
+                        sceneData->makeWarningPopUp("No drawing! \n please place a drawing first!", this);
+                        return;
+                    }
+                while   (fillDepth<myDepth){
                         sceneData->brush->setLocation(sceneData->brush->location+ Vector3f(0,0,fillStep/32.0f));
                         input->mouse3D=sceneData->brush->location;
 						 ((DrawTool*)sceneData->controller->currentTool)->paint();
@@ -202,7 +202,7 @@ void ImportBitmapButton::assembleImage(FIBITMAP* myBitmap, int imageWidth, int i
                 }
 
         ///end fill holes
-        */
+
                 //flip y and z when shift down
                 //if (input->bShiftDown){
                     //float interim=xyzNormal.y;

diff --git a/classes/layer.cpp b/classes/layer.cpp
@@ -91,10 +91,9 @@ void Layer::updateShaders(){
     if (myShader->uniforms.find("camZ") != myShader->uniforms.end()){
         glUniform3fARB(myShader->uniforms["camZ"], sceneData->controller->zAxis.x,sceneData->controller->zAxis.y,sceneData->controller->zAxis.z);
     }
-
-
-
-
+
+
+
 
     //needs if statements because the compiler throws out stuff if not used!
     if (myShader->uniforms.find("tex") != myShader->uniforms.end())
@@ -127,9 +126,22 @@ void Layer::updateShaders(){
     if (myShader->uniforms.find("cameraMatrix") != myShader->uniforms.end())
         glUniformMatrix4fv(myShader->uniforms["cameraMatrix"],1,false,(GLfloat*)renderer->cameraMatrix);
 
+
+
+    if (myShader->uniforms.find("cameraRotationMatrix") != myShader->uniforms.end())
+        glUniformMatrix4fv(myShader->uniforms["cameraRotationMatrix"],1,false,(GLfloat*)renderer->cameraRotationMatrix);
+
+    if (myShader->uniforms.find("inverseCameraRotationMatrix") != myShader->uniforms.end())
+        glUniformMatrix4fv(myShader->uniforms["inverseCameraRotationMatrix"],1,false,(GLfloat*)renderer->cameraRotationMatrix);
+
+
+
+
     if (myShader->uniforms.find("cameraInverse") != myShader->uniforms.end())
         glUniformMatrix4fvARB(myShader->uniforms["cameraInverse"], 1,false, (GLfloat*)&renderer->inverseCameraMatrix);
 
+
+
 
     if (myShader->uniforms.find("projectionMatrix") != myShader->uniforms.end())
         glUniformMatrix4fv(myShader->uniforms["projectionMatrix"],1,false,(GLfloat*)renderer->projectionMatrix);

diff --git a/classes/navTool.cpp b/classes/navTool.cpp
@@ -151,7 +151,7 @@ void NavTool::processMove(double deltaTime){
     sceneData->controller->upPoint=controlledActor->yAxis;
 
     //TODO: why is this necessary?
-    if (controlledActor==sceneData->controller)
-        sceneData->controller->upPoint=Vector3f(0,1,0);
+    //if (controlledActor==sceneData->controller)
+     //   sceneData->controller->upPoint=Vector3f(0,1,0);
 
 }