CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Removed yet another block of outdated render code, fixed unSetMode

Browse Source
This commit is contained in:
Vulpovile
2021-03-17 02:10:38 -07:00
parent 3de82eb64d
commit 7ea74a3980
2 changed files with 1 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/Application.h
View File

@@ -32,7 +32,6 @@ class Application { // : public GApp {
PartInstance* makePart(); PartInstance* makePart();
void drawButtons(RenderDevice* rd); void drawButtons(RenderDevice* rd);
void drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, LightingParameters lighting, Vector3 size, Vector3 pos, CoordinateFrame c); void drawOutline(Vector3 from, Vector3 to, RenderDevice* rd, LightingParameters lighting, Vector3 size, Vector3 pos, CoordinateFrame c);
void makeFlag(Vector3 &vec, RenderDevice* &rd);
std::vector<Instance*> getSelection(); std::vector<Instance*> getSelection();
void deleteInstance(); void deleteInstance();
void run(); void run();
@@ -49,6 +48,7 @@ class Application { // : public GApp {
void onMouseWheel(int x, int y, short delta); void onMouseWheel(int x, int y, short delta);
void setFocus(bool isFocused); void setFocus(bool isFocused);
int getMode(); int getMode();
void unSetMode();
CameraController cameraController; CameraController cameraController;
UserInput* userInput; UserInput* userInput;
PropertyWindow* _propWindow; PropertyWindow* _propWindow;

27
src/source/Application.cpp
View File

@@ -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) void Application::setMode(int mode)
{ {
_mode = mode; _mode = mode;