diff --git a/src/include/Application.h b/src/include/Application.h index 78092cc..50a4598 100644 --- a/src/include/Application.h +++ b/src/include/Application.h @@ -32,7 +32,6 @@ class Application { // : public GApp { PartInstance* makePart(); void drawButtons(RenderDevice* rd); void drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, LightingParameters lighting, Vector3 size, Vector3 pos, CoordinateFrame c); - void makeFlag(Vector3 &vec, RenderDevice* &rd); std::vector getSelection(); void deleteInstance(); void run(); @@ -49,6 +48,7 @@ class Application { // : public GApp { void onMouseWheel(int x, int y, short delta); void setFocus(bool isFocused); int getMode(); + void unSetMode(); CameraController cameraController; UserInput* userInput; PropertyWindow* _propWindow; diff --git a/src/source/Application.cpp b/src/source/Application.cpp index d172c4f..76c861c 100644 --- a/src/source/Application.cpp +++ b/src/source/Application.cpp @@ -510,33 +510,6 @@ void Application::changeTool(Tool * newTool) } -void Application::makeFlag(Vector3 &vec, RenderDevice* &rd) -{ - - Vector3 up = Vector3(vec.x, vec.y+3, vec.z); - rd->setColor(Color3::blue()); - rd->beforePrimitive(); - - glBegin(GL_LINES); - glVertex3f(vec.x, vec.y, vec.z); - glVertex3f(up.x, up.y, up.z); - glEnd(); - - glBegin( GL_TRIANGLES ); - glVertex3f(up.x, up.y-1, up.z); - glVertex3f(up.x, up.y-0.5, up.z-1); - glVertex3f(up.x, up.y, up.z); - - glVertex3f(up.x, up.y, up.z); - glVertex3f(up.x, up.y-0.5, up.z-1); - glVertex3f(up.x, up.y-1, up.z); - - glEnd(); - rd->afterPrimitive(); - rd->setColor(Color3::white()); - //I know how i will approach this now -} - void Application::setMode(int mode) { _mode = mode;