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

Changed model and texture names to not start with capital letters.

Browse Source
This commit is contained in:
Steffen Fündgens 2014-12-05 16:36:31 +01:00
parent b5deb6b9e7
commit a6c65efcee
6 changed files with 61 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
Levels/Geometry/Block.obj → Levels/Geometry/block.obj
View File

0
Levels/Geometry/Column.obj → Levels/Geometry/column.obj
View File

0
Levels/Geometry/MarbleSmooth.obj → Levels/Geometry/marbleSmooth.obj
View File

62
Levels/ObjectSetups/Compositions.xml
View File

@ -1,7 +1,7 @@
<composition> <composition>
<typeID>20</typeID> <typeID>20</typeID>
<object> <object>
<modelPath>MarbleSmooth.obj</modelPath> <modelPath>marbleSmooth.obj</modelPath>
<xOffset>0.0</xOffset> <xOffset>0.0</xOffset>
<yOffset>0.0</yOffset> <yOffset>0.0</yOffset>
<zOffset>0.0</zOffset> <zOffset>0.0</zOffset>
@ -12,7 +12,7 @@
<composition> <composition>
<typeID>40</typeID> <typeID>40</typeID>
<object> <object>
<modelPath>Block.obj</modelPath> <modelPath>block.obj</modelPath>
<xOffset>0.0</xOffset> <xOffset>0.0</xOffset>
<yOffset>1.0</yOffset> <yOffset>1.0</yOffset>
<zOffset>2.0</zOffset> <zOffset>2.0</zOffset>
@ -23,7 +23,7 @@
<composition> <composition>
<typeID>60</typeID> <typeID>60</typeID>
<object> <object>
<modelPath>Column.obj</modelPath> <modelPath>column.obj</modelPath>
<xOffset>0.0</xOffset> <xOffset>0.0</xOffset>
<yOffset>0.0</yOffset> <yOffset>0.0</yOffset>
<zOffset>0.0</zOffset> <zOffset>0.0</zOffset>
@ -54,21 +54,21 @@
<composition> <composition>
<typeID>99</typeID> <typeID>99</typeID>
<object> <object>
<modelPath>Column.obj</modelPath> <modelPath>column.obj</modelPath>
<xOffset>0.0</xOffset> <xOffset>0.0</xOffset>
<yOffset>0.0</yOffset> <yOffset>0.0</yOffset>
<zOffset>0.0</zOffset> <zOffset>0.0</zOffset>
<scale>1.0</scale> <scale>1.0</scale>
</object> </object>
<object> <object>
<modelPath>Column.obj</modelPath> <modelPath>column.obj</modelPath>
<xOffset>2.0</xOffset> <xOffset>2.0</xOffset>
<yOffset>0.0</yOffset> <yOffset>0.0</yOffset>
<zOffset>0.0</zOffset> <zOffset>0.0</zOffset>
<scale>1.0</scale> <scale>1.0</scale>
</object> </object>
<object> <object>
<modelPath>Block.obj</modelPath> <modelPath>block.obj</modelPath>
<xOffset>1.0</xOffset> <xOffset>1.0</xOffset>
<yOffset>3.0</yOffset> <yOffset>3.0</yOffset>
<zOffset>0.0</zOffset> <zOffset>0.0</zOffset>
@ -93,3 +93,53 @@
<scale>1.0</scale> <scale>1.0</scale>
</object> </object>
</composition> </composition>
<objectData>
<modelPath>marbleSmooth.obj</modelPath>
<ambientFactor></ambientFactor>
<diffuseFactor></diffuseFactor>
<specularFactor></specularFactor>
<shininess></shininess>
</objectData>
<objectData>
<modelPath>block.obj</modelPath>
<ambientFactor></ambientFactor>
<diffuseFactor></diffuseFactor>
<specularFactor></specularFactor>
<shininess></shininess>
</objectData>
<objectData>
<modelPath>column.obj</modelPath>
<ambientFactor></ambientFactor>
<diffuseFactor></diffuseFactor>
<specularFactor></specularFactor>
<shininess></shininess>
</objectData>
<objectData>
<modelPath>torch.obj</modelPath>
<ambientFactor></ambientFactor>
<diffuseFactor></diffuseFactor>
<specularFactor></specularFactor>
<shininess></shininess>
</objectData>
<objectData>
<modelPath>switch_inner.obj</modelPath>
<ambientFactor></ambientFactor>
<diffuseFactor></diffuseFactor>
<specularFactor></specularFactor>
<shininess></shininess>
</objectData>
<objectData>
<modelPath>switch_outer.obj</modelPath>
<ambientFactor></ambientFactor>
<diffuseFactor></diffuseFactor>
<specularFactor></specularFactor>
<shininess></shininess>
</objectData>

0
Levels/Textures/MovableBlockTexture.png → Levels/Textures/movableBlockTexture.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 MiB

After

Width:  |  Height:  |  Size: 3.1 MiB

10
level.cc
View File

@ -82,7 +82,7 @@ void Level::load() {
std::string modelPath = charModelPath; std::string modelPath = charModelPath;
float scale; float scale;
object->FirstChildElement("scale")->QueryFloatText(&scale); object->FirstChildElement("scale")->QueryFloatText(&scale);
Model model = Model(modelPath, scale); //Model model = Model(modelPath, scale);
} }
XMLElement* light = compositionType->FirstChildElement("light"); XMLElement* light = compositionType->FirstChildElement("light");
@ -95,7 +95,7 @@ void Level::load() {
//add player //add player
Model marbleModel = Model("MarbleSmooth.obj", 0.75f); Model marbleModel = Model("marbleSmooth.obj", 0.75f);
Material marbleMaterial = Material("marbleTexture_small.png", 0.1f, 0.5f, 0.5f, 3.0f); Material marbleMaterial = Material("marbleTexture_small.png", 0.1f, 0.5f, 0.5f, 3.0f);
Object* object = new Object(marbleModel, marbleMaterial, glm::vec3(2.0f, 10.0f, 2.0f), Object* object = new Object(marbleModel, marbleMaterial, glm::vec3(2.0f, 10.0f, 2.0f),
glm::vec3(0.0f, 0.0f, 0.0f)); glm::vec3(0.0f, 0.0f, 0.0f));
@ -118,7 +118,7 @@ void Level::load() {
glm::vec3(0.0f, 1.0472f, 0.0f)); glm::vec3(0.0f, 1.0472f, 0.0f));
objects.push_back(torchObject); objects.push_back(torchObject);
Model blockModel = Model("Block.obj", 1.0f); Model blockModel = Model("block.obj", 1.0f);
Material blockMaterial = Material("blockTexture_small.png", 0.1f, 0.6, 0.4f, 2.0f); Material blockMaterial = Material("blockTexture_small.png", 0.1f, 0.6, 0.4f, 2.0f);
Object* blockObject = new Object(blockModel, blockMaterial, glm::vec3(0.0f, 10.0f, 0.0f), Object* blockObject = new Object(blockModel, blockMaterial, glm::vec3(0.0f, 10.0f, 0.0f),
glm::vec3(0.0f, 0.0f, 0.0f)); glm::vec3(0.0f, 0.0f, 0.0f));
@ -132,8 +132,8 @@ void Level::load() {
physicObjects.push_back(blockObject2); physicObjects.push_back(blockObject2);
physics.addBox(1,3.0f,1,*blockObject2,2,physicObjects.size()); physics.addBox(1,3.0f,1,*blockObject2,2,physicObjects.size());
Model columnModel = Model("Column.obj", 1.0f); Model columnModel = Model("column.obj", 1.0f);
Material columnMaterial = Material("ColumnTexture2.png", 0.1f, 0.6, 0.4f, 2.0f); Material columnMaterial = Material("columnTexture2.png", 0.1f, 0.6, 0.4f, 2.0f);
Object* columnObject = new Object(columnModel, columnMaterial, glm::vec3(-2.0f, 7.0f, -2.0f), Object* columnObject = new Object(columnModel, columnMaterial, glm::vec3(-2.0f, 7.0f, -2.0f),
glm::vec3(0.0f, 0.0f, 0.0f)); glm::vec3(0.0f, 0.0f, 0.0f));
objects.push_back(columnObject); objects.push_back(columnObject);