faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity

Changed a few material parameters.

Browse Source
This commit is contained in:
Fabian Klemp 2015-03-09 16:01:03 +01:00
parent 4f6784e406
commit 8dab0b313d
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/levels/Compositions.xml
View File

@ -629,7 +629,7 @@
<ambientFactor>0.13</ambientFactor> <ambientFactor>0.13</ambientFactor>
<diffuseFactor>0.6</diffuseFactor> <diffuseFactor>0.6</diffuseFactor>
<specularFactor>0.4</specularFactor> <specularFactor>0.4</specularFactor>
<shininess>2.0</shininess> <shininess>1.0</shininess>
<physicType>None</physicType> <physicType>None</physicType>
<renderable>true</renderable> <renderable>true</renderable>
</objectData> </objectData>
@ -641,7 +641,7 @@
<ambientFactor>0.13</ambientFactor> <ambientFactor>0.13</ambientFactor>
<diffuseFactor>0.6</diffuseFactor> <diffuseFactor>0.6</diffuseFactor>
<specularFactor>0.4</specularFactor> <specularFactor>0.4</specularFactor>
<shininess>2.0</shininess> <shininess>1.0</shininess>
<physicType>Box</physicType> <physicType>Box</physicType>
<width>1.2</width> <width>1.2</width>
<height>6</height> <height>6</height>
@ -702,7 +702,7 @@
<ambientFactor>0.13</ambientFactor> <ambientFactor>0.13</ambientFactor>
<diffuseFactor>0.6</diffuseFactor> <diffuseFactor>0.6</diffuseFactor>
<specularFactor>0.4</specularFactor> <specularFactor>0.4</specularFactor>
<shininess>2.0</shininess> <shininess>1.0</shininess>
<physicType>TriangleMesh</physicType> <physicType>TriangleMesh</physicType>
<dampningL>0.555</dampningL> <dampningL>0.555</dampningL>
<dampningA>0.5</dampningA> <dampningA>0.5</dampningA>
@ -715,7 +715,7 @@
<ambientFactor>0.13</ambientFactor> <ambientFactor>0.13</ambientFactor>
<diffuseFactor>0.6</diffuseFactor> <diffuseFactor>0.6</diffuseFactor>
<specularFactor>0.4</specularFactor> <specularFactor>0.4</specularFactor>
<shininess>2.0</shininess> <shininess>1.0</shininess>
<physicType>TriangleMesh</physicType> <physicType>TriangleMesh</physicType>
<dampningL>0.555</dampningL> <dampningL>0.555</dampningL>
<dampningA>0.5</dampningA> <dampningA>0.5</dampningA>

2
data/levels/Level1.xml
View File

@ -13092,7 +13092,7 @@
<ambientFactor>0.13</ambientFactor> <ambientFactor>0.13</ambientFactor>
<diffuseFactor>0.8</diffuseFactor> <diffuseFactor>0.8</diffuseFactor>
<specularFactor>0.2</specularFactor> <specularFactor>0.2</specularFactor>
<shininess>3.0</shininess> <shininess>1.0</shininess>
</terrain> </terrain>
<skydome> <skydome>

2
loader.cc
View File

@ -145,7 +145,7 @@ void Loader::load(std::string filePath, Level* level, std::string compositionsPa
water_vao->bind(); water_vao->bind();
water_vao->setMode(GL_TRIANGLES); water_vao->setMode(GL_TRIANGLES);
water_vao->attachAllAttributes(water_ab); water_vao->attachAllAttributes(water_ab);
Material water_material = Material(waterTexture, 0.1f, 0.2f, 0.8f, 5.0f, true); Material water_material = Material(waterTexture, 0.13f, 0.5f, 0.5f, 10.0f, true);
Object* water_object = new Object(water_vao, water_material, glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f), true); Object* water_object = new Object(water_vao, water_material, glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f), true);
level->setWaterPlane(water_object); level->setWaterPlane(water_object);
} }