diff -uNr c2/clientQT/draw/treeDrawFactory.cpp c3/clientQT/draw/treeDrawFactory.cpp --- c2/clientQT/draw/treeDrawFactory.cpp 2004-08-20 17:26:55.000000000 +0200 +++ c3/clientQT/draw/treeDrawFactory.cpp 2005-10-24 21:02:55.938611601 +0200 @@ -10,6 +10,7 @@ #include "drawScene.h" #include "formview.h" #include "moveToPositionEvent.h" +#include "treeDrawTest.h" using namespace std; @@ -192,6 +193,9 @@ if (type == QString("gpsmark")) { newDraw = tagGeometryGpsMark(geometryNode, newDraw); } + if (type == QString("test")) { + newDraw = TreeDrawTest::tagGeometry(geometryNode, newDraw); + } /* Insert Draw into GraphicsObjectsContainer */ if (newDraw) { diff -uNr c2/clientQT/draw/treeDrawTest.cpp c3/clientQT/draw/treeDrawTest.cpp --- c2/clientQT/draw/treeDrawTest.cpp 1970-01-01 01:00:00.000000000 +0100 +++ c3/clientQT/draw/treeDrawTest.cpp 2005-10-25 06:55:27.936483050 +0200 @@ -0,0 +1,27 @@ +#define GL_GLEXT_PROTOTYPES +#include "draw/treeDrawTest.h" +#include +#include +#include + +TreeDrawTest::TreeDrawTest() { + printf("TreeDrawTest new\n"); +} + +void TreeDrawTest::draw(Point3D *viewer, bool viewculling, QGLWidget *widget, Point3D direction, int phase) { + if (phase!=2) return; + + printf("TreeDrawTest\n"); + glPushMatrix(); + + // put a sphere at 0N, 0E + glTranslatef(-1,0,0); + glutSolidSphere(0.1, 10, 10); + + glPopMatrix(); +} + +Draw *TreeDrawTest::tagGeometry(QDomNode geometryNode, Draw *newDraw) { + printf("TreeDrawTest tag\n"); + return(new TreeDrawTest()); +} diff -uNr c2/clientQT/draw/treeDrawTest.h c3/clientQT/draw/treeDrawTest.h --- c2/clientQT/draw/treeDrawTest.h 1970-01-01 01:00:00.000000000 +0100 +++ c3/clientQT/draw/treeDrawTest.h 2005-10-24 21:02:23.360348103 +0200 @@ -0,0 +1,18 @@ +#ifndef TREEDRAWTEST_H +#define TREEDRAWTEST_H +#include "treeDraw.h" +#include +#include +#include +#include "imageList.h" + +class TreeDrawTest : public Draw { + public: + TreeDrawTest(); + + static Draw *tagGeometry(QDomNode geometryNode, Draw *newdraw); + + virtual void draw(Point3D *viewer, bool viewculling, QGLWidget *widget, Point3D direction, int phase); +}; + +#endif diff -uNr c2/clientQT/earth3d.pro c3/clientQT/earth3d.pro --- c2/clientQT/earth3d.pro 2005-09-09 18:25:20.000000000 +0200 +++ c3/clientQT/earth3d.pro 2005-10-24 21:02:36.321065932 +0200 @@ -67,7 +67,7 @@ # QMAKE_CXXFLAGS_DEBUG += -D EARTH3DDEBUG CONFIG += qt thread opengl warn_on release stl -# LIBS += -lglut +LIBS += -lglut # DEFINES += STATISTIC_NODECOUNT INCLUDEPATH += /usr/include/libxml2/libxml /usr/include/libxml2 ../../network/rubyAgents/c ../../dataserver /sw/include /usr/X11R6/include/ /sw/include/libxml2 geometry/ network/ draw/ tree/ ./ @@ -122,6 +122,7 @@ tree/textureTreeNodeCore.cpp \ draw/draw.cpp \ draw/treeDraw.cpp \ + draw/treeDrawTest.cpp \ draw/treeDrawSphere.cpp \ draw/treeDrawPOI.cpp \ draw/treeDrawPOISign.cpp \