From 8635bbc76a83c026d244ee5efc72b4ecd62a584e Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sat, 2 Feb 2013 14:10:42 +1000 Subject: A few minor clean ups. --- ClientHamr/extantz/CDemo.cpp | 2 +- ClientHamr/extantz/extantz.c | 3 +-- ClientHamr/extantz/extantzCamera.cpp | 4 +++- LuaSL/build.sh | 3 +++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ClientHamr/extantz/CDemo.cpp b/ClientHamr/extantz/CDemo.cpp index 642adc3..2013bdd 100644 --- a/ClientHamr/extantz/CDemo.cpp +++ b/ClientHamr/extantz/CDemo.cpp @@ -10,7 +10,7 @@ CDemo::CDemo(GLData *gld, bool a) : additive(a), device(gld->device), - currentScene(2), + currentScene(0), quakeLevelMesh(0), quakeLevelNode(0), skyboxNode(0), model1(0), model2(0), campFire(0), metaSelector(0), mapSelector(0), sceneStartTime(0), timeForThisScene(0) diff --git a/ClientHamr/extantz/extantz.c b/ClientHamr/extantz/extantz.c index 6d45501..4d723a3 100644 --- a/ClientHamr/extantz/extantz.c +++ b/ClientHamr/extantz/extantz.c @@ -337,7 +337,7 @@ static void _cb_mouse_down_GL(void *data, Evas *evas, Evas_Object *obj, void *ev if (1 == ev->button) { gld->camFocus = 1; - printf("Background GL object focused.\n"); + // TODO, figure out how to unfocus elm. } } @@ -351,7 +351,6 @@ static void _cb_mouse_down_elm(void *data, Evas *evas, Evas_Object *obj, void *e gld->camFocus = 0; // TODO - Yes we really DO need to figure out what was clicked on and set focus to it. sigh // elm_object_focus_set(gld->bx, EINA_TRUE); - printf("ELM object focused.\n"); } } diff --git a/ClientHamr/extantz/extantzCamera.cpp b/ClientHamr/extantz/extantzCamera.cpp index 8337f8c..4d4be02 100644 --- a/ClientHamr/extantz/extantzCamera.cpp +++ b/ClientHamr/extantz/extantzCamera.cpp @@ -26,7 +26,7 @@ namespace scene { // Irrlicht hard codes a reference to the original FPS camera code inside it's scene manager. This is that code extracted so we can be more flexible. -// TODO - Hmmm, Where's CursorControl come from? Ah, passed to the scene manager constructor, it's a GUI thing that we need to replace with an EFL thing. +// TODO - Hmmm, Where's CursorControl come from? Ah, passed to the scene manager constructor, it's a GUI thing that we need to replace with an EFL thing. But only for mouselook mode. ICameraSceneNode *addExtantzCamera(ISceneManager* sm, ISceneNode* parent, s32 id) { ICameraSceneNode* node = sm->addCameraSceneNode(parent, core::vector3df(), core::vector3df(0, 0, 100), id, true); @@ -81,6 +81,8 @@ extantzCamera::~extantzCamera() * Which would even work in fly mode. * A joystick could be set to range over -2.0 to 2.0, and just set it's part directly. * A mouse look rotate, well will come to that when we need to. B-) + * I think setting the x or y to be the window position of the mouse (-1.0 to 1.0) should do it. + * Or not. meh */ void extantzCamera::animateNode(ISceneNode* node, u32 timeMs) diff --git a/LuaSL/build.sh b/LuaSL/build.sh index 5e60691..f0ed7aa 100755 --- a/LuaSL/build.sh +++ b/LuaSL/build.sh @@ -29,6 +29,9 @@ CFLAGS="$CFLAGS -I $E17DIR/include/embryo-1" CFLAGS="$CFLAGS -I $E17DIR/include/edje-1" CFLAGS="$CFLAGS -I $E17DIR/include/evas-1" CFLAGS="$CFLAGS -I $E17DIR/include/ecore-1" +CFLAGS="$CFLAGS -I $E17DIR/include/ecore-con-1" +CFLAGS="$CFLAGS -I $E17DIR/include/ecore-evas-1" +CFLAGS="$CFLAGS -I $E17DIR/include/ecore-file-1" CFLAGS="$CFLAGS -I $E17DIR/include" CFLAGS="$CFLAGS -DPACKAGE_DATA_DIR=\"$LOCALDIR\" $CFLAGOPTS" -- cgit v1.1