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

Merge branch 'master' of github.com:Faerbit/swp

Browse Source
This commit is contained in:
Steffen Fündgens 2014-12-05 16:19:06 +01:00
commit b5deb6b9e7
3 changed files with 235 additions and 935 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Blenderfiles/ruins_column.blend
View File

Binary file not shown.

1168
Levels/Geometry/Column.obj
View File

File diff suppressed because it is too large Load Diff

2
level.cc
View File

@ -133,7 +133,7 @@ void Level::load() {
physics.addBox(1,3.0f,1,*blockObject2,2,physicObjects.size());
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),
glm::vec3(0.0f, 0.0f, 0.0f));
objects.push_back(columnObject);