From 33b6e10b32220c4834515c2ad76f7fb578b90d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steffen=20F=C3=BCndgens?= Date: Fri, 7 Nov 2014 16:44:12 +0100 Subject: [PATCH] added skeletal constructor to physics.hh --- level.cc | 6 ++++++ physics.hh | 4 ++++ terrain.hh | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/level.cc b/level.cc index b621806..6b73d91 100644 --- a/level.cc +++ b/level.cc @@ -2,6 +2,7 @@ Level::Level(std::string filePath){ this->filePath = filePath; + terrain = Terrain(filePath + "/terrain"); } Level::Level() { @@ -11,6 +12,10 @@ Level::~Level() { } void Level::load(Shader shader) { + terrain.load(); + + + // currently hard coded should later read this stuff out of a file // load the geometry of the stanford bunny and build a VAO: Model model = Model("Bunny.obj"); @@ -33,6 +38,7 @@ void Level::render() { for(int i = 0; i #include "texture.hh" #include -#include "extern/bullet/src/BulletDynamics/Dynamics/btRigidBody.h" class Terrain { public: