diff options
Diffstat (limited to 'DisplayClass.cpp')
| -rw-r--r-- | DisplayClass.cpp | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/DisplayClass.cpp b/DisplayClass.cpp index 2a85cd2..b34156b 100644 --- a/DisplayClass.cpp +++ b/DisplayClass.cpp @@ -17,25 +17,32 @@ DisplayClass::~DisplayClass() { } void DisplayClass::renderScene(unsigned long delta, std::bitset<256>& keys) { - /*angle += delta*0.025; + angle += delta*0.005; if(angle >= 360) - angle -= 360;*/ + angle -= 360; + + static bool on = true; + static float angle2 =5; + if (angle2 <= 10 && on){angle2 += 0.5;} + else if (angle2 >=0 && !on){angle2 -= 0.5;} + else if (angle2 >=10)on=false; + else if (angle2 <=0)on=true; glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - keyhandler(keys); +// keyhandler(keys); glLoadIdentity(); // Clean up matrix - glTranslatef(0.0, -2.0, -20.0); // Then set up transformation -// glRotatef(10, 1.0, 0.0, 0.0); -// glRotatef(angle, 0.0, 1.0, 0.0); + glTranslatef(0.0, -2.0, -12.0); // Then set up transformation + glRotatef(angle2, 1.0, 0.0, 0.0); + glRotatef(angle, 0.0, 1.0, 0.0); // glRotatef(angle*2, 1.0, 0.0, 0.0); -// glRotatef(angle*3, 0.0, 0.0, 1.0); -// glRotatef(-angle*5, 1.0, 1.0, 1.0); +// glRotatef(angle*3, 1.0, 0.5, 0.0); +// glRotatef(-angle*5, 1.0, 1.0, 0.0); // static Temparray temp(20, x, y, z); - static House house(20, x, y, z, 100, 300, 53.55, 0.82, 2.82, 0.0047, 40, 45, 1900, 3, 11500); + static House house(20, x, y, z, 100, 400, 53.55, 0.82, 2.82, 0.0047, 40, 45, 1900, 3, 11500); triangles=house.getTriangles(); house.controller(); //// temp.calcTemp(); |