[Orxonox-commit 7492] r12098 - in code/branches/shader_HS18: data/levels src/libraries/tools

[wiesep at orxonox.net]

Author: wiesep
Date: 2018-11-11 17:38:58 +0100 (Sun, 11 Nov 2018)
New Revision: 12098

Modified:
   code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw
   code/branches/shader_HS18/src/libraries/tools/Mesh.cc
   code/branches/shader_HS18/src/libraries/tools/Timer.h
Log:
Working version

Modified: code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw
===================================================================
--- code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw	2018-11-11 16:38:26 UTC (rev 12097)
+++ code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw	2018-11-11 16:38:58 UTC (rev 12098)
@@ -22,27 +22,27 @@
   <?lua include("includes/notifications.oxi") ?>
 
   <Scene
-    ambientlight = "0.8, 0.8, 0.8"
+    ambientlight = "0.5, 0.5, 0.5"
     skybox       = "Orxonox/Starbox"
   >
 
-    
+
   <!--
     <Light type=directional position="0,0,0" direction="0.253, 0.593, -0.765" diffuse="1.0, 0.9, 0.9, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
   -->
 
-    <Light type=point position="0,0,300" lookat="0,0,0" diffuse="0.8, 0.7, 0.7, 1.0" specular="0.5, 0.9, 0.9, 1.0"/>
-    <Model position="0,0,200" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
+    <Light type=point position="100,0,300" lookat="0,0,0" diffuse="0.5, 0.5, 0.5, 1.0" specular="0.5, 0.9, 0.9, 1.0"/>
+    <Model position="100,0,200" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
 
-    <Light type=point position="0,0,-200" lookat="0,0,0" diffuse="0.8, 0.7, 0.7, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    <Model position="0,0,-200" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
-
-    <Light type=point position="0,200,0" lookat="0,0,0" diffuse="0.8, 0.7, 0.7, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    <Model position="0,200,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
+    <Light type=point position="100,0,-200" lookat="0,0,0" diffuse="0.5, 0.5, 0.5, 1.0" specular="0.5, 0.5, 0.5, 1.0"/>
+    <Model position="100,0,-200" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
 <!--
-    <Light type=point position="0,-200,0" lookat="0,0,0" diffuse="0.8, 0.7, 0.7, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
-    <Model position="0,-200,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
+    <Light type=point position="100,200,0" lookat="0,0,0" diffuse="0.8, 0.7, 0.7, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+    <Model position="100,200,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
 
+    <Light type=point position="20,-200,0" lookat="0,0,0" diffuse="0.8, 0.7, 0.7, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
+    <Model position="20,-200,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
+
     <Light type=point position="200,0,0" lookat="0,0,0" diffuse="0.8, 0.7, 0.7, 1.0" specular="1.0, 0.9, 0.9, 1.0"/>
     <Model position="200,0,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>
 
@@ -55,7 +55,6 @@
     <Model position="0, 0,-160" yaw="90" pitch="-90" roll="0" scale="5" mesh="Cube_Lava_Normal.mesh" />-->
     <Model position="0, 12,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Cube_Lava_V2.mesh" />
     <Model position="0, -12,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Cube_Lava_V2_Normal.mesh" />
-    
+
   </Scene>
 </Level>
-

Modified: code/branches/shader_HS18/src/libraries/tools/Mesh.cc
===================================================================
--- code/branches/shader_HS18/src/libraries/tools/Mesh.cc	2018-11-11 16:38:26 UTC (rev 12097)
+++ code/branches/shader_HS18/src/libraries/tools/Mesh.cc	2018-11-11 16:38:58 UTC (rev 12098)
@@ -64,7 +64,7 @@
         if (this->entity_)
             this->scenemanager_->destroyEntity(this->entity_);
 
-    
+
         if (GameMode::showsGraphics())
         {
             try
@@ -72,7 +72,7 @@
                 this->entity_ = this->scenemanager_->createEntity("Mesh" + multi_cast<std::string>(Mesh::meshCounter_s++), meshsource);
                 this->entity_->setCastShadows(this->bCastShadows_);
 
-               
+
                 unsigned short src, dest;
                 if (!this->entity_->getMesh()->suggestTangentVectorBuildParams(Ogre::VertexElementSemantic::VES_TANGENT, src, dest))
                 {
@@ -119,7 +119,7 @@
         {
                 this->entity_->getSubEntity(index)->setMaterialName(name);
         }
-        else 
+        else
             orxout() << "ERROR at Index " << index << endl;
     }
 

Modified: code/branches/shader_HS18/src/libraries/tools/Timer.h
===================================================================
--- code/branches/shader_HS18/src/libraries/tools/Timer.h	2018-11-11 16:38:26 UTC (rev 12097)
+++ code/branches/shader_HS18/src/libraries/tools/Timer.h	2018-11-11 16:38:58 UTC (rev 12098)
@@ -77,6 +77,7 @@
 #define _Timer_H__
 
 #include "tools/ToolsPrereqs.h"
+#include <functional>
 
 #include "core/object/Listable.h"
 #include "core/command/ExecutorPtr.h"