Red cube model

djbozkosz · May 19, 2016 · d04b5d7 · d04b5d7
1 parent fd1f353
commit d04b5d7
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 2 deletions.
diff --git a/bin/LightPropagationVolumes.exe b/bin/LightPropagationVolumes.exe
diff --git a/bin/LightPropagationVolumes_SDL_No_Gui.exe b/bin/LightPropagationVolumes_SDL_No_Gui.exe
diff --git a/data/maps/red.bmp b/data/maps/red.bmp
diff --git a/data/maps/red_ddn.bmp b/data/maps/red_ddn.bmp
diff --git a/data/maps/red_spec.bmp b/data/maps/red_spec.bmp
diff --git a/data/models/cube00.4ds b/data/models/cube00.4ds
diff --git a/src/engine.cpp b/src/engine.cpp
@@ -263,7 +263,7 @@ void CEngine::onTimeoutInit()
   camera.setRotation(glm::vec3(5.0f, -90.0f, 0.0f));
 
   engine.scenes = 3;
-  engine.lpvModelsCount = 2;
+  engine.lpvModelsCount = 3;
   engine.activeLpvModel.resize(engine.scenes);
   engine.camTrackPos.resize(engine.scenes);
   engine.camTrackRot.resize(engine.scenes);
@@ -294,7 +294,7 @@ void CEngine::onTimeoutInit()
       SSceneModel(models.addModel(SModel(std::string(NFile::STR_DATA_MODELS)+"sphere00.4ds")), true));
 
     // lpv test models
-    const char *const lpvModels[] = { "bunny00", "sphere01" };
+    const char *const lpvModels[] = { "bunny00", "sphere01", "cube00" };
 
     for(uint32 j = 0; j < engine.lpvModelsCount; j++)
     {

diff --git a/ui/mainWindow.ui b/ui/mainWindow.ui
@@ -483,6 +483,11 @@
             <string>Sphere</string>
            </property>
           </item>
+          <item>
+           <property name="text">
+            <string>Red Cube</string>
+           </property>
+          </item>
          </widget>
         </item>
        </layout>