Menu
▾
▴
[Grappelmann-commits] spaceplane gravity.cpp,1.6,1.7 material.cpp,1.1,1.2 mesh.cpp,1.5,1.6 object3d.h,1.3,1.4 scene_object.cpp,1.4,1.5 transform.cpp,1.2,1.3
|
From: Mike D. <o3d...@us...> - 2004-08-17 19:49:56
|
Update of /cvsroot/grappelmann/spaceplane In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10780 Modified Files: gravity.cpp material.cpp mesh.cpp object3d.h scene_object.cpp transform.cpp Log Message: - various small changes - fixed rotation radian -> degree changes Index: transform.cpp =================================================================== RCS file: /cvsroot/grappelmann/spaceplane/transform.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** transform.cpp 15 Aug 2004 21:07:35 -0000 1.2 --- transform.cpp 17 Aug 2004 18:21:43 -0000 1.3 *************** *** 1,8 **** /* ! $Id */ #include "transform.h" Transform::Transform(SceneObject* parent) --- 1,9 ---- /* ! $Id$ */ #include "transform.h" + #include <math.h> Transform::Transform(SceneObject* parent) *************** *** 32,35 **** --- 33,39 ---- m_rotationSize = rotationSize; + // convert rotationSize from radians to degrees + m_rotationSize = rotationSize * (360 / M_PI); + return true; } *************** *** 48,56 **** cout << "<Transform::_draw>\tscale x [" << m_scale.m_x << "] y [" << m_scale.m_y << "] z [" << m_scale.m_z << "]" << endl; glRotatef(m_rotationSize, m_rotation.m_x, m_rotation.m_y, m_rotation.m_z); ! //glTranslatef(m_translation.m_x, m_translation.m_y, m_translation.m_z); ! //glScalef(m_scale.m_x, m_scale.m_y, m_scale.m_z); ! drawChildren(); return true; --- 52,67 ---- cout << "<Transform::_draw>\tscale x [" << m_scale.m_x << "] y [" << m_scale.m_y << "] z [" << m_scale.m_z << "]" << endl; + glTranslatef(m_translation.m_x, m_translation.m_y, m_translation.m_z); glRotatef(m_rotationSize, m_rotation.m_x, m_rotation.m_y, m_rotation.m_z); ! glScalef(m_scale.m_x, m_scale.m_y, m_scale.m_z); ! //glTranslatef(m_translation.m_z, m_translation.m_x, m_translation.m_y); ! cout << "drawing children" << endl; ! //debugging ! //if((m_scale.m_x == 1.0) && (m_scale.m_y == 1.0) && (m_scale.m_z == 1.0)) { ! drawChildren(); ! //} ! ! cout << "done" << endl; return true; *************** *** 59,62 **** --- 70,78 ---- /* $Log$ + Revision 1.3 2004/08/17 18:21:43 o3dozone + + - various small changes + - fixed rotation radian -> degree changes + Revision 1.2 2004/08/15 21:07:35 o3dozone - added scale operation Index: object3d.h =================================================================== RCS file: /cvsroot/grappelmann/spaceplane/object3d.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** object3d.h 15 Aug 2004 21:07:35 -0000 1.3 --- object3d.h 17 Aug 2004 18:21:43 -0000 1.4 *************** *** 44,50 **** --- 44,52 ---- }; + /* ModelDrawer* getModelDrawer() { return m_modelDrawer; }; + */ void setMass(double mass) { Index: scene_object.cpp =================================================================== RCS file: /cvsroot/grappelmann/spaceplane/scene_object.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** scene_object.cpp 25 Jul 2004 10:35:59 -0000 1.4 --- scene_object.cpp 17 Aug 2004 18:21:43 -0000 1.5 *************** *** 55,63 **** bool SceneObject::drawChildren() { - glPushMatrix(); for(vector<SceneObject*>::iterator i = m_children.begin(); i != m_children.end(); i++) { (*i)->draw(); - } glPopMatrix(); return true; --- 55,63 ---- bool SceneObject::drawChildren() { for(vector<SceneObject*>::iterator i = m_children.begin(); i != m_children.end(); i++) { + glPushMatrix(); (*i)->draw(); glPopMatrix(); + } return true; *************** *** 101,104 **** --- 101,109 ---- /* $Log$ + Revision 1.5 2004/08/17 18:21:43 o3dozone + + - various small changes + - fixed rotation radian -> degree changes + Revision 1.4 2004/07/25 10:35:59 o3dozone - added material and transform nodes Index: mesh.cpp =================================================================== RCS file: /cvsroot/grappelmann/spaceplane/mesh.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** mesh.cpp 15 Aug 2004 21:07:35 -0000 1.5 --- mesh.cpp 17 Aug 2004 18:21:43 -0000 1.6 *************** *** 40,50 **** // then draw the children ! /* for(vector<Polygon>::iterator i = m_polygons.begin(); i != m_polygons.end(); i++) { (*i).draw(); } - */ ! glutSolidSphere(0.5, 10, 10); // draw any sub nodes --- 40,50 ---- // then draw the children ! for(vector<Polygon>::iterator i = m_polygons.begin(); i != m_polygons.end(); i++) { (*i).draw(); } ! ! //glutSolidSphere(0.5, 10, 10); // draw any sub nodes *************** *** 56,59 **** --- 56,64 ---- /* $Log$ + Revision 1.6 2004/08/17 18:21:43 o3dozone + + - various small changes + - fixed rotation radian -> degree changes + Revision 1.5 2004/08/15 21:07:35 o3dozone - added scale operation Index: material.cpp =================================================================== RCS file: /cvsroot/grappelmann/spaceplane/material.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** material.cpp 25 Jul 2004 10:37:12 -0000 1.1 --- material.cpp 17 Aug 2004 18:21:43 -0000 1.2 *************** *** 54,57 **** --- 54,58 ---- GLfloat mat_diffuse[] = { m_diffuse[0], m_diffuse[1], m_diffuse[2], 1.0 }; GLfloat mat_emission[] = { m_emission[0], m_emission[1], m_emission[2], 1.0 }; + /* glMaterialfv(GL_FRONT, GL_SPECULAR, mat_specular); glMaterialfv(GL_FRONT, GL_SHININESS, mat_shininess); *************** *** 59,62 **** --- 60,64 ---- glMaterialfv(GL_FRONT, GL_DIFFUSE, mat_diffuse); glMaterialfv(GL_FRONT, GL_EMISSION, mat_emission); + */ drawChildren(); *************** *** 67,70 **** --- 69,77 ---- /* $Log$ + Revision 1.2 2004/08/17 18:21:43 o3dozone + + - various small changes + - fixed rotation radian -> degree changes + Revision 1.1 2004/07/25 10:37:12 o3dozone - added material and transform nodes Index: gravity.cpp =================================================================== RCS file: /cvsroot/grappelmann/spaceplane/gravity.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** gravity.cpp 15 Aug 2004 21:07:34 -0000 1.6 --- gravity.cpp 17 Aug 2004 18:21:43 -0000 1.7 *************** *** 336,339 **** --- 336,341 ---- Coord3D lightPos; + position.m_z = -15; + slugMobile->makeDisplayList(); *************** *** 344,348 **** //objectArray.push_back(Object3D(&monkeyDrawer)); //Object3D& viewPoint = objectArray[0]; ! //long objectCount = 0; for(; objectCount < MAX_OBJECTARRAY_SIZE; objectCount++) { --- 346,350 ---- //objectArray.push_back(Object3D(&monkeyDrawer)); //Object3D& viewPoint = objectArray[0]; ! long objectCount = 0; for(; objectCount < MAX_OBJECTARRAY_SIZE; objectCount++) { *************** *** 372,378 **** --- 374,383 ---- + glTranslatef(0.0, 0.0, -5.0); + // now loop until we are done while(!SystemStateSingleton::instance().done) { + cerr << "frame" << endl; if(!handleEvents(rotation, position, lightPos)) { printf("Error in event handler!\n"); *************** *** 466,470 **** //printf("drawing screen\n"); ! //sleep(1); } --- 471,475 ---- //printf("drawing screen\n"); ! sleep(1); } *************** *** 481,484 **** --- 486,494 ---- /* $Log$ + Revision 1.7 2004/08/17 18:21:43 o3dozone + + - various small changes + - fixed rotation radian -> degree changes + Revision 1.6 2004/08/15 21:07:34 o3dozone - added scale operation |
