aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/ClientHamr
diff options
context:
space:
mode:
authorDavid Walter Seikel2013-02-02 14:10:42 +1000
committerDavid Walter Seikel2013-02-02 14:10:42 +1000
commit8635bbc76a83c026d244ee5efc72b4ecd62a584e (patch)
tree69a69e5c0c0b34fcda10fdc2f28b45e4ec74aa82 /ClientHamr
parentFix up those arrow keys by getting elm out of the loop. (diff)
downloadSledjHamr-8635bbc76a83c026d244ee5efc72b4ecd62a584e.zip
SledjHamr-8635bbc76a83c026d244ee5efc72b4ecd62a584e.tar.gz
SledjHamr-8635bbc76a83c026d244ee5efc72b4ecd62a584e.tar.bz2
SledjHamr-8635bbc76a83c026d244ee5efc72b4ecd62a584e.tar.xz
A few minor clean ups.
Diffstat (limited to 'ClientHamr')
-rw-r--r--ClientHamr/extantz/CDemo.cpp2
-rw-r--r--ClientHamr/extantz/extantz.c3
-rw-r--r--ClientHamr/extantz/extantzCamera.cpp4
3 files changed, 5 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 @@
10CDemo::CDemo(GLData *gld, bool a) 10CDemo::CDemo(GLData *gld, bool a)
11: additive(a), 11: additive(a),
12 device(gld->device), 12 device(gld->device),
13 currentScene(2), 13 currentScene(0),
14 quakeLevelMesh(0), quakeLevelNode(0), skyboxNode(0), model1(0), model2(0), 14 quakeLevelMesh(0), quakeLevelNode(0), skyboxNode(0), model1(0), model2(0),
15 campFire(0), metaSelector(0), mapSelector(0), sceneStartTime(0), 15 campFire(0), metaSelector(0), mapSelector(0), sceneStartTime(0),
16 timeForThisScene(0) 16 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
337 if (1 == ev->button) 337 if (1 == ev->button)
338 { 338 {
339 gld->camFocus = 1; 339 gld->camFocus = 1;
340 printf("Background GL object focused.\n"); 340 // TODO, figure out how to unfocus elm.
341 } 341 }
342} 342}
343 343
@@ -351,7 +351,6 @@ static void _cb_mouse_down_elm(void *data, Evas *evas, Evas_Object *obj, void *e
351 gld->camFocus = 0; 351 gld->camFocus = 0;
352 // TODO - Yes we really DO need to figure out what was clicked on and set focus to it. sigh 352 // TODO - Yes we really DO need to figure out what was clicked on and set focus to it. sigh
353// elm_object_focus_set(gld->bx, EINA_TRUE); 353// elm_object_focus_set(gld->bx, EINA_TRUE);
354 printf("ELM object focused.\n");
355 } 354 }
356} 355}
357 356
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
26{ 26{
27 27
28// 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. 28// 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.
29// 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. 29// 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.
30ICameraSceneNode *addExtantzCamera(ISceneManager* sm, ISceneNode* parent, s32 id) 30ICameraSceneNode *addExtantzCamera(ISceneManager* sm, ISceneNode* parent, s32 id)
31{ 31{
32 ICameraSceneNode* node = sm->addCameraSceneNode(parent, core::vector3df(), core::vector3df(0, 0, 100), id, true); 32 ICameraSceneNode* node = sm->addCameraSceneNode(parent, core::vector3df(), core::vector3df(0, 0, 100), id, true);
@@ -81,6 +81,8 @@ extantzCamera::~extantzCamera()
81 * Which would even work in fly mode. 81 * Which would even work in fly mode.
82 * A joystick could be set to range over -2.0 to 2.0, and just set it's part directly. 82 * A joystick could be set to range over -2.0 to 2.0, and just set it's part directly.
83 * A mouse look rotate, well will come to that when we need to. B-) 83 * A mouse look rotate, well will come to that when we need to. B-)
84 * I think setting the x or y to be the window position of the mouse (-1.0 to 1.0) should do it.
85 * Or not. meh
84 */ 86 */
85 87
86void extantzCamera::animateNode(ISceneNode* node, u32 timeMs) 88void extantzCamera::animateNode(ISceneNode* node, u32 timeMs)