Changeset 69 in flair-src for trunk/lib/FlairSimulator/src/Gui_impl.cpp

Timestamp:

09/02/16 17:48:40 (8 years ago)

Author:

Sanahuja Guillaume

Message:

refonte camera simu

File:

• trunk/lib/FlairSimulator/src/Gui_impl.cpp (modified) (14 diffs)

trunk/lib/FlairSimulator/src/Gui_impl.cpp

@@ -22 +22 @@
 #include "Model.h"
 #include "Model_impl.h"
-#include "AnimPoursuite.h"
 #include <Object.h>
 #include <Euler.h>
@@ -40 +39 @@
 public:
   // This is the one method that we have to implement
-  virtual bool OnEvent(const SEvent &event) {
+  bool OnEvent(const SEvent &event) {
     // Remember whether each key is down or up
     if (event.EventType == EET_KEY_INPUT_EVENT)
       KeyIsDown[event.KeyInput.Key] = event.KeyInput.PressedDown;
 
-    // Send all other events to camera
-    if (event.EventType == EET_MOUSE_INPUT_EVENT && camera)
-      // return camera->OnEvent(event);
-      return camera->MouseMoved(event, cursorControl->getRelativePosition());
-
     if (model)
       return model->OnEvent(event);
@@ -57 +51 @@
 
   // This is used to check whether a key is being held down
-  virtual bool IsKeyDown(EKEY_CODE keyCode) {
+  bool IsKeyDown(EKEY_CODE keyCode) {
     if (KeyIsDown[keyCode] == true) {
       KeyIsDown[keyCode] = false;
@@ -66 +60 @@
   }
 
-  MyEventReceiver(ICursorControl *cursorControl) {
-    this->cursorControl = cursorControl;
-    camera = NULL;
+  MyEventReceiver(void) {
     model = NULL;
     for (u32 i = 0; i < KEY_KEY_CODES_COUNT; ++i)
       KeyIsDown[i] = false;
   }
-  void SetCamera(AnimPoursuite *camera) { this->camera = camera; }
   void SetModel(Model *model) { this->model = model; }
 
@@ -79 +70 @@
   // We use this array to store the current state of each key
   bool KeyIsDown[KEY_KEY_CODES_COUNT];
-  AnimPoursuite *camera;
   Model *model;
-  ICursorControl *cursorControl;
 };
 
@@ -96 +85 @@
   device = createDevice(driver_type, dimension2d<u32>(app_width, app_height),
                         16, false, false, false);
-  receiver = new MyEventReceiver(device->getCursorControl());
+  receiver = new MyEventReceiver();
   device->setEventReceiver(receiver);
   device->getLogger()->setLogLevel(ELL_NONE);
@@ -109 +98 @@
   smgr->setAmbientLight(video::SColorf(1, 1, 1));
 
+/*
+   // camera
+  camera = smgr->addCameraSceneNode();
+
+  camera->setAspectRatio(
+      (float)scene_width / (float)scene_height); // on force a cause du view port
+
+  camera->setUpVector(vector3df(0, 0, 1));
+
+  FixedCamera* animator = new FixedCamera(vector3df(1,1,1));
+  camera->addAnimator(animator);
+
+  camera->setFarValue(8000);*/
   /*
 env = device->getGUIEnvironment();
@@ -185 +187 @@
   int cam_id = 0;
 
-  receiver->SetCamera(models.at(cam_id)->pimpl_->animator);
   receiver->SetModel(models.at(cam_id));
 
@@ -199 +200 @@
     }
     for (size_t j = 0; j < models.size(); j++) {
-      if (i == j)
-        continue;
+      if (i == j) continue;
       models.at(i)->pimpl_->MetaTriangleSelector()->addTriangleSelector(
           models.at(j)->pimpl_->TriangleSelector());
@@ -247 +247 @@
 
     // vue poursuite
-    smgr->setActiveCamera(models.at(cam_id)->pimpl_->camera);
+    smgr->setActiveCamera(models.at(cam_id)->getFollowMeCamera()->getCameraSceneNode());
     driver->setViewPort(core::rect<s32>(0, 0, scene_width, scene_height));
     smgr->drawAll(); // commente voir plus bas
@@ -279 +279 @@
     // mais a priori souci avec models.at(i)->pimpl_->CheckCollision();
     // (setelipsoid?)
-    smgr->setActiveCamera(models.at(cam_id)->pimpl_->camera);
+    smgr->setActiveCamera(models.at(cam_id)->getFollowMeCamera()->getCameraSceneNode());
     driver->setViewPort(core::rect<s32>(0, 0, scene_width, scene_height));
     smgr->drawAll();
@@ -294 +294 @@
     if (receiver->IsKeyDown(KEY_PRIOR)) {
       cam_id++;
-      if (cam_id >= (int)models.size())
-        cam_id = 0;
-      receiver->SetCamera(models.at(cam_id)->pimpl_->animator);
+      if (cam_id >= (int)models.size()) cam_id = 0;
       receiver->SetModel(models.at(cam_id));
       setWindowCaption(models.at(cam_id), fps);
@@ -302 +300 @@
     if (receiver->IsKeyDown(KEY_NEXT)) {
       cam_id--;
-      if (cam_id < 0)
-        cam_id = models.size() - 1;
-      receiver->SetCamera(models.at(cam_id)->pimpl_->animator);
+      if (cam_id < 0) cam_id = models.size() - 1;
       receiver->SetModel(models.at(cam_id));
       setWindowCaption(models.at(cam_id), fps);
@@ -355 +351 @@
   }
 
-  receiver->SetCamera(NULL);
   receiver->SetModel(NULL);
 }