diff --git a/src/include/Globals.h b/src/include/Globals.h index 04d6f04..76f10d9 100644 --- a/src/include/Globals.h +++ b/src/include/Globals.h @@ -10,7 +10,7 @@ public: Globals(void); ~Globals(void); static DataModelInstance* dataModel; - static bool showMouse; + //static bool showMouse; static POINT mousepoint; static bool useMousePoint; static const int gen; diff --git a/src/include/Tool/Tool.h b/src/include/Tool/Tool.h index 292db3f..ab69430 100644 --- a/src/include/Tool/Tool.h +++ b/src/include/Tool/Tool.h @@ -26,9 +26,9 @@ public: virtual void onMouseScroll(Mouse);//Kinda virtual void onKeyDown(int);//yes virtual void onKeyUp(int);//yes - virtual int getCursorId();//yes + //virtual int getCursorId();//yes protected: - virtual void setCursor(std::string); + //virtual void setCursor(std::string); private: - std::string cursorString; + //std::string cursorString; }; diff --git a/src/source/Application.cpp b/src/source/Application.cpp index b74f93f..05b9741 100644 --- a/src/source/Application.cpp +++ b/src/source/Application.cpp @@ -635,14 +635,14 @@ void Application::onGraphics(RenderDevice* rd) { { mouseOnScreen = false; //ShowCursor(true); - _window->setMouseVisible(true); + //_window->setMouseVisible(true); //rd->window()->setInputCaptureCount(0); } else { mouseOnScreen = true; //SetCursor(NULL); - _window->setMouseVisible(false); + //_window->setMouseVisible(false); //rd->window()->setInputCaptureCount(1); } @@ -709,7 +709,7 @@ void Application::onGraphics(RenderDevice* rd) { rd->afterPrimitive(); - Draw::box(G3D::Box(mouse.getPosition()-Vector3(2,0.5F,1),mouse.getPosition()+Vector3(2,0.5F,1)), rd, Color3::cyan(), Color4::clear()); + //Draw::box(G3D::Box(mouse.getPosition()-Vector3(2,0.5F,1),mouse.getPosition()+Vector3(2,0.5F,1)), rd, Color3::cyan(), Color4::clear()); if(g_selectedInstances.size() > 0) { for(size_t i = 0; i < g_selectedInstances.size(); i++) @@ -742,7 +742,7 @@ void Application::onGraphics(RenderDevice* rd) { } renderDevice->push2D(); _dataModel->getGuiRoot()->renderGUI(renderDevice, m_graphicsWatch.FPS()); - rd->pushState(); + /*rd->pushState(); rd->beforePrimitive(); if(Globals::showMouse && mouseOnScreen) @@ -768,7 +768,7 @@ void Application::onGraphics(RenderDevice* rd) { } } */ - glBindTexture( GL_TEXTURE_2D, tool->getCursorId()); + /*glBindTexture( GL_TEXTURE_2D, tool->getCursorId()); glBegin( GL_QUADS ); @@ -782,11 +782,11 @@ void Application::onGraphics(RenderDevice* rd) { glVertex2f( mousepos.x-64, mousepos.y+64 ); glEnd(); - glDisable( GL_TEXTURE_2D ); - } + glDisable( GL_TEXTURE_2D );*/ + //} - rd->afterPrimitive(); - rd->popState(); + /*rd->afterPrimitive(); + rd->popState();*/ renderDevice->pop2D(); } diff --git a/src/source/Globals.cpp b/src/source/Globals.cpp index 981bb0a..fc67cba 100644 --- a/src/source/Globals.cpp +++ b/src/source/Globals.cpp @@ -6,7 +6,7 @@ int const Globals::major = 100; int const Globals::minor = 4; int const Globals::patch = 3; int Globals::surfaceId = 2; -bool Globals::showMouse = true; +//bool Globals::showMouse = true; bool Globals::useMousePoint = false; std::vector postRenderStack = std::vector(); diff --git a/src/source/Tool/ArrowTool.cpp b/src/source/Tool/ArrowTool.cpp index afcc577..20dfa07 100644 --- a/src/source/Tool/ArrowTool.cpp +++ b/src/source/Tool/ArrowTool.cpp @@ -29,8 +29,6 @@ void ArrowTool::onButton1MouseDown(Mouse mouse) } void ArrowTool::onButton1MouseUp(Mouse mouse) { - if(dragging) - this->setCursor(GetFileInPath("/content/images/ArrowCursor.png")); mouseDown = false; dragging = false; } @@ -43,7 +41,6 @@ void ArrowTool::onMouseMoved(Mouse mouse) { if(abs(mouse.x-mouseDownStartx) > 5 || abs(mouse.y-mouseDownStarty) > 5) { - this->setCursor(GetFileInPath("/content/images/GrabRotateCursor.png")); dragging = true; } else return; @@ -58,13 +55,10 @@ void ArrowTool::onMouseMoved(Mouse mouse) return; } PartInstance * target = mouse.getTarget(); - if(target == NULL) - this->setCursor(GetFileInPath("/content/images/ArrowCursor.png")); - else this->setCursor(GetFileInPath("/content/images/DragCursor.png")); + //if(target == NULL) } void ArrowTool::onSelect(Mouse mouse) { - this->setCursor(GetFileInPath("/content/images/ArrowCursor.png")); } void ArrowTool::onKeyDown(int key) diff --git a/src/source/Tool/Tool.cpp b/src/source/Tool/Tool.cpp index 109d372..19c49cf 100644 --- a/src/source/Tool/Tool.cpp +++ b/src/source/Tool/Tool.cpp @@ -2,7 +2,7 @@ Tool::Tool(void) { - cursorString = GetFileInPath("/content/images/ArrowFarCursor.png"); + //cursorString = GetFileInPath("/content/images/ArrowFarCursor.png"); //cursorId = cursorRef->openGLID(); } @@ -22,11 +22,11 @@ void Tool::onDeselect(Mouse mouse){} void Tool::onMouseScroll(Mouse mouse){} void Tool::onKeyDown(int key){} void Tool::onKeyUp(int key){} -void Tool::setCursor(std::string str) +/*void Tool::setCursor(std::string str) { - cursorString = str; -} -int Tool::getCursorId() + //cursorString = str; +}*/ +/*int Tool::getCursorId() { return TextureHandler::getTexturePermanent(cursorString); -} \ No newline at end of file +}*/ \ No newline at end of file diff --git a/src/source/WindowFunctions.cpp b/src/source/WindowFunctions.cpp index 218508f..544596c 100644 --- a/src/source/WindowFunctions.cpp +++ b/src/source/WindowFunctions.cpp @@ -23,7 +23,7 @@ bool createWindowClass(const char* name,WNDPROC proc,HMODULE hInstance) { stringstream errMsg; errMsg<<"Failed to register " << name; - MessageBox(NULL, errMsg.str().c_str(),"Dynamica Crash", MB_OK); + MessageBox(NULL, errMsg.str().c_str(),"Blocks3D Crash", MB_OK); return false; } return true;