summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-09-18 23:10:58 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-09-18 23:10:58 -0300
commit3f9e5afe68df1e3b4bcf34a21468ed55a57a7973 (patch)
treeb4f5fa413429dc9e9aa50d82a6c47e641f6e433b /main
parent89a901c4b6a2fe24e781e497ec1a8e8fd69dd59c (diff)
begin work on debugging collisions....
Diffstat (limited to 'main')
-rw-r--r--main/main.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/main/main.cpp b/main/main.cpp
index 9b7e190e03..69e4dc38ed 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -97,6 +97,7 @@ static OS::VideoMode video_mode;
static bool init_maximized=false;
static bool init_fullscreen=false;
static bool init_use_custom_pos=false;
+static bool debug_collisions=false;
static Vector2 init_custom_pos;
static int video_driver_idx=-1;
static int audio_driver_idx=-1;
@@ -514,6 +515,8 @@ Error Main::setup(const char *execpath,int argc, char *argv[],bool p_second_phas
} else if (I->get()=="-debug" || I->get()=="-d") {
debug_mode="local";
+ } else if (I->get()=="-debugcol" || I->get()=="-dc") {
+ debug_collisions=true;
} else if (I->get()=="-editor_scene") {
if (I->next()) {
@@ -1154,8 +1157,12 @@ bool Main::start() {
SceneTree *sml = main_loop->cast_to<SceneTree>();
+ if (debug_collisions) {
+ sml->set_debug_collisions_hint(true);
+ }
#ifdef TOOLS_ENABLED
+
EditorNode *editor_node=NULL;
if (editor) {