Changeset 12098 for code/branches/shader_HS18
- Timestamp:
- Nov 11, 2018, 5:38:58 PM (6 years ago)
- Location:
- code/branches/shader_HS18
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw
r12095 r12098 23 23 24 24 <Scene 25 ambientlight = "0. 8, 0.8, 0.8"25 ambientlight = "0.5, 0.5, 0.5" 26 26 skybox = "Orxonox/Starbox" 27 27 > 28 28 29 29 30 30 <!-- 31 31 <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"/> 32 32 --> 33 33 34 <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"/>35 <Model position=" 0,0,200" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/>34 <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"/> 35 <Model position="100,0,200" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/> 36 36 37 <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"/> 38 <Model position="0,0,-200" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/> 37 <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"/> 38 <Model position="100,0,-200" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/> 39 <!-- 40 <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"/> 41 <Model position="100,200,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/> 39 42 40 <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"/> 41 <Model position="0,200,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/> 42 <!-- 43 <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"/> 44 <Model position="0,-200,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/> 43 <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"/> 44 <Model position="20,-200,0" mesh="Coordinates.mesh" scale="3" lookat="0,0,0"/> 45 45 46 46 <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" /> 57 57 <Model position="0, -12,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Cube_Lava_V2_Normal.mesh" /> 58 58 59 59 </Scene> 60 60 </Level> 61 -
code/branches/shader_HS18/src/libraries/tools/Mesh.cc
r12076 r12098 65 65 this->scenemanager_->destroyEntity(this->entity_); 66 66 67 67 68 68 if (GameMode::showsGraphics()) 69 69 { … … 73 73 this->entity_->setCastShadows(this->bCastShadows_); 74 74 75 75 76 76 unsigned short src, dest; 77 77 if (!this->entity_->getMesh()->suggestTangentVectorBuildParams(Ogre::VertexElementSemantic::VES_TANGENT, src, dest)) … … 120 120 this->entity_->getSubEntity(index)->setMaterialName(name); 121 121 } 122 else 122 else 123 123 orxout() << "ERROR at Index " << index << endl; 124 124 } -
code/branches/shader_HS18/src/libraries/tools/Timer.h
r12029 r12098 78 78 79 79 #include "tools/ToolsPrereqs.h" 80 #include <functional> 80 81 81 82 #include "core/object/Listable.h"
Note: See TracChangeset
for help on using the changeset viewer.