From 7e04bd038acb6ca1217a2049f8bbf8f154316ff4 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 13 Oct 2014 15:04:03 +0000 Subject: [PATCH] =?UTF-8?q?scene:=20remove=20functions=20that=20aren?= =?UTF-8?q?=E2=80=99t=20that=20useful.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/debug/lines.cpp | 4 ++-- src/scene.cpp | 13 ++----------- src/scene.h | 2 -- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/debug/lines.cpp b/src/debug/lines.cpp index 6f1ca147..2b1e1ad1 100644 --- a/src/debug/lines.cpp +++ b/src/debug/lines.cpp @@ -104,8 +104,8 @@ void Debug::DrawLine(vec3 a, vec3 b) { Debug::Dra void Debug::DrawLine(vec2 a, vec3 b, float az) { Debug::DrawLine(a, b, g_scene->GetLineColor(), az); } void Debug::DrawLine(vec2 a, vec2 b, float az, float bz) { Debug::DrawLine(a, b, g_scene->GetLineColor(), az, bz); } void Debug::DrawLine(vec3 a, vec3 b, vec4 color) { g_scene->AddLine(a, b, color); } -void Debug::DrawLine(vec2 a, vec3 b, vec4 color, float az) { g_scene->AddLine(a, b, color, az); } -void Debug::DrawLine(vec2 a, vec2 b, vec4 color, float az, float bz){ g_scene->AddLine(a, b, color, az, bz); } +void Debug::DrawLine(vec2 a, vec3 b, vec4 color, float az) { g_scene->AddLine(vec3(a, az), b, color); } +void Debug::DrawLine(vec2 a, vec2 b, vec4 color, float az, float bz){ g_scene->AddLine(vec3(a, az), vec3(b, bz), color); } //-- GIZMO -------------------------------------------------------------------- void Debug::DrawGizmo(vec3 pos, vec3 x, vec3 y, vec3 z, float size) diff --git a/src/scene.cpp b/src/scene.cpp index 69eaa74e..fe9a795a 100644 --- a/src/scene.cpp +++ b/src/scene.cpp @@ -215,17 +215,8 @@ vec4 Scene::GetLineColor() { return data->m_new_line_color; } void Scene::AddLine(vec3 a, vec3 b, vec4 color) { - data->m_lines.Push(a, b, color, data->m_new_line_time, data->m_new_line_mask, false, false); -} - -void Scene::AddLine(vec2 a, vec3 b, vec4 color, float az) -{ - data->m_lines.Push(vec3(a, az), b, color, data->m_new_line_time, data->m_new_line_mask, true, false); -} - -void Scene::AddLine(vec2 a, vec2 b, vec4 color, float az, float bz) -{ - data->m_lines.Push(vec3(a, az), vec3(b, bz), color, data->m_new_line_time, data->m_new_line_mask, true, true); + data->m_lines.Push(a, b, color, data->m_new_line_time, + data->m_new_line_mask, false, false); } void Scene::AddLight(Light *l) diff --git a/src/scene.h b/src/scene.h index aecf5461..6786cd6e 100644 --- a/src/scene.h +++ b/src/scene.h @@ -62,8 +62,6 @@ public: void SetLineColor(vec4 new_color=vec4(1.f)); vec4 GetLineColor(); void AddLine(vec3 a, vec3 b, vec4 color); - void AddLine(vec2 a, vec3 b, vec4 color, float az=-1.f); - void AddLine(vec2 a, vec2 b, vec4 color, float az=-1.f, float bz=-1.f); void AddLight(Light *light); array const &GetLights() const;