...

1 files changed, 4 insertions, 5 deletions

diff --git a/DisplayClass.cpp b/DisplayClass.cpp
index 174e4ac..f60fc96 100644
--- a/DisplayClass.cpp
+++ b/DisplayClass.cpp
@@ -1,6 +1,4 @@
 #include "DisplayClass.h"
-#include "gl.h"
-
 
 DisplayClass::Renderer DisplayClass::render;
 
@@ -76,9 +74,10 @@ void DisplayClass::renderScene(unsigned long delta) {
 //  glRotatef(-angle*5, 1.0, 1.0, 1.0);
   
   
-  static Temparray temp(20, x, y, z);
-  triangles=temp.getTriangles();
-  temp.calcTemp();
+//  static Temparray temp(20, x, y, z);
+  static House house(20, x, y, z, 70, 300, 53.55, 0.82, 2.82, 0.0047, 40, 45, 1900, 3, 11500);
+  triangles=house.getTriangles();
+  house.controller();
   
   //vmml::mat4f transform, inverseTransform;
   //glGetFloatv(GL_MODELVIEW_MATRIX, transform.array);