Merge branch 'feature_28' into develop

modules/heliumGameCore/include/heliumObjectsWorldIntefrace.h

@@ -51,6 +51,12 @@ class IHeliumObjectsWorld {
     * @param Object index
     */
     virtual void signOutObject( ObjectsIdType )=0;
+
+    /**
+    * @brief Delete object from scene and from memory
+    * @param Object index
+    */
+    virtual void delayedSignOut( ObjectsIdType )=0;
 };
 
 #endif // HELIUM_OBJECTS_WORLD_INTEFRACE_INCLUDED 

modules/heliumSceneObjects/CMakeLists.txt

@@ -8,12 +8,12 @@ INCLUDE( heliumIncludes )
 
 SET ( heliumSceneObjects_SRCS
         ${HELIUM_MODULES_DIR}/heliumSceneObjects/src/heliumSceneObjects.cpp
-        ${HELIUM_MODULES_DIR}/heliumSceneObjects/src/heliumPrepared3DObjects.cpp
+        ${HELIUM_MODULES_DIR}/heliumSceneObjects/src/heliumPreparedSceneObjects.cpp
     )
 
 SET ( heliumSceneObjects_HDRS
         ${HELIUM_MODULES_DIR}/heliumSceneObjects/include/heliumSceneObjects.h
-        ${HELIUM_MODULES_DIR}/heliumSceneObjects/include/heliumPrepared3DObjects.h
+        ${HELIUM_MODULES_DIR}/heliumSceneObjects/include/heliumPreparedSceneObjects.h
     ) 
 
 ADD_LIBRARY ( heliumSceneObjects STATIC

modules/heliumSceneObjects/include/heliumPrepared3DObjects.h → modules/heliumSceneObjects/include/heliumPreparedSceneObjects.h

@@ -15,8 +15,9 @@
 
 typedef enum {
     PREPARED_3D_UNKNOWN = 0,
+    PREPARED_3D_HELIUM_556_BULLET_BOX = 1,
     PREPARED_3D_LAST
-} HeliumPrepared3D; 
+} HeliumPreparedSceneObjects; 
 
 
 struct HeliumTestBarrel : public PackagedSceneObject {
@@ -36,5 +37,45 @@ struct HeliumTestBox : public PackagedSceneObject {
     ~HeliumTestBox() {}
 };
 
+struct Helium556BulletBox : public PackagedSceneObject {
+    Helium556BulletBox( double pos_x, double pos_y, double pos_z, double size );
+};
+
+class HeliumSceneArchitecktHand : public SceneObject {
+public:
+
+    /**
+    * @brief Create null hand and if click - > object will be picked up from the scene
+    */
+    HeliumSceneArchitecktHand(IHeliumObjectsWorld::ObjectsIdType id=0);
+
+
+    ~HeliumSceneArchitecktHand();
+
+    void lifeStep();
+
+    /**
+    * @brief
+    */  
+    void mousePoint( int button, bool upDown, Polycode::Vector2 mouse );
+
+    /**
+    * @brief
+    */  
+    void mouseDoubleClick();
+
+private:
+    IHeliumObjectsWorld::ObjectsIdType creatingObject;
+
+};
+
+class HeliumSceneArchitecktHandPack : public PackagedSceneObject {
+public:
+
+    HeliumSceneArchitecktHandPack( IHeliumObjectsWorld::ObjectsIdType id=0);
+
+    ~HeliumSceneArchitecktHandPack();
+};
+
 #endif // HELIUM_PREPARED_3D_OBJECTS_INCLUDED
 

modules/heliumSceneObjects/include/heliumSceneObjects.h

@@ -11,6 +11,7 @@
 #ifndef HELIUM_SCENE_OBJECTS_INCLUDED
 #define HELIUM_SCENE_OBJECTS_INCLUDED
 
+#include <list>
 #include <set>
 #include <map>
 
@@ -102,7 +103,12 @@ class SceneObject {
     /**
     * @brief
     */  
-    virtual void mouseClick( bool upDown ) {}
+    virtual void mouseClick( int button, bool upDown ) {}
+
+    /**
+    * @brief
+    */  
+    virtual void mousePoint( int button, bool upDown, Polycode::Vector2 mouse ) {}
 
     /**
     * @brief
@@ -116,6 +122,11 @@ class SceneObject {
         return model;
     }
 
+    /**
+    * @brief
+    */  
+    IHeliumObjectsWorld::ObjectsIdType getId()const;
+
 protected:
     Polycode::SceneEntity* model;
 };
@@ -158,11 +169,17 @@ class SceneObjectsWorld : public IHeliumObjectsWorld {
 
 
     /**
-    * @brief Delete object from scene and from memory
+    * @brief Immediately delete helium scene object from scene and from memory
     * @param Object index
     */
     void signOutObject( IHeliumObjectsWorld::ObjectsIdType );
 
+    /**
+    * @brief Delete object from scene and from memory
+    * @param Object index
+    */
+    void delayedSignOut( IHeliumObjectsWorld::ObjectsIdType );
+
     /**
     * @brief add helium scene object to sceneWorld
     * @param pointer to PackagedSceneObjects, you must to destruct after that
@@ -173,15 +190,30 @@ class SceneObjectsWorld : public IHeliumObjectsWorld {
     typedef std::pair< IHeliumObjectsWorld::ObjectsIdType, SceneObject* > AlifePairType;
 
     /**
-    *
+    * 
     */
-    void setCameraMovingDirection(Polycode::Vector2 dir);
+    void cameraHorizonMovingDirection(Polycode::Vector2 dir);
 
     /**
     *
     */
     Polycode::RayTestResult rayTest(Polycode::Vector2);
 
+    /**
+    *
+    */
+    IHeliumObjectsWorld::ObjectsIdType getObjectIdByEntity(Polycode::SceneEntity* entity)const;
+
+    /**
+    * @brief add id of object to queue of mouse point click
+    */
+    void addObjectToMousePointQueue(IHeliumObjectsWorld::ObjectsIdType);  
+
+    /**
+    * @brief warp object to point, if it exist of course
+    */
+    void warpTo(IHeliumObjectsWorld::ObjectsIdType, Polycode::Vector3, bool resetRotation=true);  
+
 protected:
     Polycode::PhysicsScene* engineScene;
     Polycode::Vector2 horisontalVectorMove;
@@ -193,14 +225,32 @@ class SceneObjectsWorld : public IHeliumObjectsWorld {
     //!> container of alife objects, have reactions and posible have behavior
     std::map< IHeliumObjectsWorld::ObjectsIdType, SceneObject* > alifeObjects;
     typedef std::map< IHeliumObjectsWorld::ObjectsIdType, SceneObject* >::iterator AlifeIterator;
+
+
+    std::set< IHeliumObjectsWorld::ObjectsIdType > queueToMousePoint;
+    std::list< IHeliumObjectsWorld::ObjectsIdType > delayedSignOutObjects;
+
+private:    
+    /**
+    * @return True - if the queue in mot empty, otherwise False 
+    */
+    bool checkQueueToMousePointClick( int button, bool upDown, Polycode::Vector2 mouse );
+    void checkDelayedSignOutObject();
+
+    /**
+    * @param 
+    */
+    void addPackagedToEngineScene( PackagedSceneObject* obj );
+
+    void engineSceneWarpTo( Polycode::SceneEntity* obj, Polycode::Vector3 point, bool resetRotation );
 };
 
 /**
 *
 */
 class PackagedSceneObject {
 public:
-    PackagedSceneObject() {}
+    PackagedSceneObject();
     virtual ~PackagedSceneObject(){};
 
     /**
@@ -247,7 +297,7 @@ class PackagedSceneObject {
         POLY_ENTITY_PHYSICAL,     
         POLY_ENTITY_EMPTY
     } PolySceneEntityType;
-        
+
     /**
     * @brief
     */  
@@ -264,13 +314,18 @@ class PackagedSceneObject {
     IHeliumObjectsWorld::ObjectsIdType getId()const;
 
     /**
-    * @brief
+    * @return Polycode::SceneEntity pointer
     */  
     Polycode::SceneEntity* getModel()const;
-
+
+    /**
+    * @return necessary to add to mouse point queue by default
+    */
+    bool getToMousePointQueue()const;
+
 protected:
     //!> Pointer to PolySceneObject helium wrap
-    SceneObject* heliumAlife;
+    SceneObject* heliumObject;
 
     int alife;
     PolySceneEntityType entityType;
@@ -281,6 +336,8 @@ class PackagedSceneObject {
     Number restitution;
     int    group;
     bool   compoundChildren;
+
+    bool   addToMousePointQueue;
 };
 
 /**