Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Nov 11, 2018, 5:38:58 PM (3 years ago)
Author:
wiesep
Message:

Working version

Location:
code/branches/shader_HS18
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/shader_HS18/data/levels/ShaderHS18_Test.oxw

    r12095 r12098  
    2323
    2424  <Scene
    25     ambientlight = "0.8, 0.8, 0.8"
     25    ambientlight = "0.5, 0.5, 0.5"
    2626    skybox       = "Orxonox/Starbox"
    2727  >
    2828
    29    
     29
    3030  <!--
    3131    <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"/>
    3232  -->
    3333
    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"/>
    3636
    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"/>
    3942
    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"/>
    4545
    4646    <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"/>
     
    5656    <Model position="0, 12,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Cube_Lava_V2.mesh" />
    5757    <Model position="0, -12,0" yaw="90" pitch="-90" roll="0" scale="10" mesh="Cube_Lava_V2_Normal.mesh" />
    58    
     58
    5959  </Scene>
    6060</Level>
    61 
  • code/branches/shader_HS18/src/libraries/tools/Mesh.cc

    r12076 r12098  
    6565            this->scenemanager_->destroyEntity(this->entity_);
    6666
    67    
     67
    6868        if (GameMode::showsGraphics())
    6969        {
     
    7373                this->entity_->setCastShadows(this->bCastShadows_);
    7474
    75                
     75
    7676                unsigned short src, dest;
    7777                if (!this->entity_->getMesh()->suggestTangentVectorBuildParams(Ogre::VertexElementSemantic::VES_TANGENT, src, dest))
     
    120120                this->entity_->getSubEntity(index)->setMaterialName(name);
    121121        }
    122         else 
     122        else
    123123            orxout() << "ERROR at Index " << index << endl;
    124124    }
  • code/branches/shader_HS18/src/libraries/tools/Timer.h

    r12029 r12098  
    7878
    7979#include "tools/ToolsPrereqs.h"
     80#include <functional>
    8081
    8182#include "core/object/Listable.h"
Note: See TracChangeset for help on using the changeset viewer.