added skeletal constructor to physics.hh

This commit is contained in:
Steffen Fündgens 2014-11-07 16:44:12 +01:00
parent 85c7bc8cb5
commit 33b6e10b32
3 changed files with 10 additions and 1 deletions

View File

@ -2,6 +2,7 @@
Level::Level(std::string filePath){ Level::Level(std::string filePath){
this->filePath = filePath; this->filePath = filePath;
terrain = Terrain(filePath + "/terrain");
} }
Level::Level() { Level::Level() {
@ -11,6 +12,10 @@ Level::~Level() {
} }
void Level::load(Shader shader) { void Level::load(Shader shader) {
terrain.load();
// currently hard coded should later read this stuff out of a file // currently hard coded should later read this stuff out of a file
// load the geometry of the stanford bunny and build a VAO: // load the geometry of the stanford bunny and build a VAO:
Model model = Model("Bunny.obj"); Model model = Model("Bunny.obj");
@ -33,6 +38,7 @@ void Level::render() {
for(int i = 0; i<objects.size(); i++) { for(int i = 0; i<objects.size(); i++) {
objects[i].render(); objects[i].render();
} }
terrain.render();
} }
glm::vec3 Level::getAmbientLight() { glm::vec3 Level::getAmbientLight() {

View File

@ -1,4 +1,8 @@
#ifndef PHYSICS_HH_INCLUDED #ifndef PHYSICS_HH_INCLUDED
#define PHYSICS_HH_INCLUDED #define PHYSICS_HH_INCLUDED
class Physics {
public:
Physics();
};
#endif #endif

View File

@ -4,7 +4,6 @@
#include <string> #include <string>
#include "texture.hh" #include "texture.hh"
#include <fstream> #include <fstream>
#include "extern/bullet/src/BulletDynamics/Dynamics/btRigidBody.h"
class Terrain { class Terrain {
public: public: