added skeletal constructor to physics.hh
This commit is contained in:
parent
85c7bc8cb5
commit
33b6e10b32
6
level.cc
6
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<objects.size(); i++) {
|
||||
objects[i].render();
|
||||
}
|
||||
terrain.render();
|
||||
}
|
||||
|
||||
glm::vec3 Level::getAmbientLight() {
|
||||
|
@ -1,4 +1,8 @@
|
||||
#ifndef PHYSICS_HH_INCLUDED
|
||||
#define PHYSICS_HH_INCLUDED
|
||||
|
||||
class Physics {
|
||||
public:
|
||||
Physics();
|
||||
};
|
||||
#endif
|
||||
|
@ -4,7 +4,6 @@
|
||||
#include <string>
|
||||
#include "texture.hh"
|
||||
#include <fstream>
|
||||
#include "extern/bullet/src/BulletDynamics/Dynamics/btRigidBody.h"
|
||||
|
||||
class Terrain {
|
||||
public:
|
||||
|
Loading…
Reference in New Issue
Block a user