Changeset 12098 for code/branches

Timestamp:

Nov 11, 2018, 5:38:58 PM (6 years ago)

Author:

wiesep

Message:

Working version

Location:

code/branches/shader_HS18

Files:

• data/levels/ShaderHS18_Test.oxw (modified) (2 diffs)
• src/libraries/tools/Mesh.cc (modified) (3 diffs)
• src/libraries/tools/Timer.h (modified) (1 diff)

code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw

@@ -23 +23 @@
 
   <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="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="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="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="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="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"/>
@@ -56 +56 @@
     <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>
-

code/branches/shader_HS18/src/libraries/tools/Mesh.cc

@@ -65 +65 @@
             this->scenemanager_->destroyEntity(this->entity_);
 
-    
+
         if (GameMode::showsGraphics())
         {
@@ -73 +73 @@
                 this->entity_->setCastShadows(this->bCastShadows_);
 
-               
+
                 unsigned short src, dest;
                 if (!this->entity_->getMesh()->suggestTangentVectorBuildParams(Ogre::VertexElementSemantic::VES_TANGENT, src, dest))
@@ -120 +120 @@
                 this->entity_->getSubEntity(index)->setMaterialName(name);
         }
-        else 
+        else
             orxout() << "ERROR at Index " << index << endl;
     }

code/branches/shader_HS18/src/libraries/tools/Timer.h

@@ -78 +78 @@
 
 #include "tools/ToolsPrereqs.h"
+#include <functional>
 
 #include "core/object/Listable.h"