JAMSPOOK-17 - Better collision shapes for level

- Track pieces exported to bcos formats.
- Textures updated.
- Updated code to match.

src/JamSpookGame.cpp

@@ -41,6 +41,9 @@ JamSpookGame::JamSpookGame():
     // Create physics system
     addSystem(make_shared<PhysicsSystem>());
 
+    // Add physics related asset loaders
+    assetSystem->addLoader(make_shared<CollisionShapeLoader>(assetPath), "CollisionShapeLoader");
+
     // Create animation system
     addSystem(make_shared<AnimationSystem>());
 
@@ -270,8 +273,8 @@ void JamSpookGame::set()
 
     ballFactory->createBall(vec3(0, 3, 0),  // position
                             1.0f,           // size
-                            1.0f*2,         // size*2
+                            10.0f,         // size*2
-                            1.0f,           // restitution
+                            0.1f,           // restitution
                             "base",         // ballName
                             vec3(1,1,1));   // lightColor
 

src/JamSpookGame.h

@@ -30,6 +30,7 @@
 #include <ecos/asset/AssetSystem.h>
 #include <ecos/asset/AssetFileSystem.h>
 #include <ecos/physics/PhysicsSystem.h>
+#include <ecos/physics/loaders/CollisionShapeLoader.h>
 #include <ecos/animation/AnimationSystem.h>
 #include <ecos/interaction/InteractionSystem.h>
 #include <ecos/graphics/GraphicsSystem.h>
@@ -93,6 +94,8 @@ using ecos::utility::getIntInRange;
 using ecos::asset::AssetSystem;
 using ecos::asset::AssetFileSystem;
 using ecos::physics::PhysicsSystem;
+using ecos::physics::CollisionShapeLoader;
+using ecos::graphics::TextureBlankLoader;
 using ecos::animation::AnimationSystem;
 using ecos::interaction::InteractionSystem;
 using ecos::interaction::InputDeviceState;

src/entities/BallFactory.cpp

@@ -36,7 +36,7 @@ shared_ptr<Entity> BallFactory::createBall(const vec3 position,
     mat4 transform = translate(mat4(1), position);
 
     // Add physics component
-    ColliderFactory* colliderFactory = new ColliderFactory(mPhysicsSystem);
+    ColliderFactory* colliderFactory = new ColliderFactory(mPhysicsSystem, mAssetSystem);
     shared_ptr<BallPhysicsComponent> physicsComponent =
             make_shared<BallPhysicsComponent>(
                     transform,
@@ -55,6 +55,9 @@ shared_ptr<Entity> BallFactory::createBall(const vec3 position,
     physicsComponent->getCollider()->getRigidBody()->setLinearFactor(btVector3(1,1,1));  // allow all positional movement movement
     physicsComponent->getCollider()->getRigidBody()->setAngularFactor(btVector3(1,1,1)); // allow all rotational movement movement
     physicsComponent->getCollider()->getRigidBody()->setRestitution(restitution);
+//    physicsComponent->getCollider()->getRigidBody()->setGravity(btVector3(0,-1,0));       // no gravity, length of zero
+    physicsComponent->getCollider()->getRigidBody()->setActivationState(DISABLE_DEACTIVATION); // RigidBody may never sleep. (Note: Or else it will not respond to setLinearVelocity when standing still for too long(a couple of seconds).)
+
     entity->addComponent(physicsComponent);
 
     // Add graphics component
@@ -67,7 +70,7 @@ shared_ptr<Entity> BallFactory::createBall(const vec3 position,
 
     // Add the ModelRenderable of a ball
     ModelRenderableFactory* modelFactory = new ModelRenderableFactory(mAssetSystem);
-    shared_ptr<ModelRenderable> modelRenderable = modelFactory->createModel("ball.f3d",
+    shared_ptr<ModelRenderable> modelRenderable = modelFactory->createModel("ball.bcosm",
                                                                             name + "-ball.png",
                                                                             name + "-model");
     delete modelFactory;

src/entities/BallFactory.h

@@ -13,6 +13,7 @@
 #include <memory>
 #include <functional>
 #include <vector>
+
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 
@@ -60,10 +61,12 @@ using std::dynamic_pointer_cast;
 using std::function;
 using std::bind;
 using std::vector;
+
 using glm::vec3;
 using glm::mat4;
 using glm::quat;
 using glm::translate;
+
 using ecos::utility::getShared;
 using ecos::core::IDCache;
 using ecos::core::logging::Log;
@@ -97,19 +100,20 @@ using ecos::physics::PhysicsComponent;
 using ecos::physics::ColliderFactory;
 using ecos::physics::Collider;
 
+///
 class BallFactory
 {
 private:
-    weak_ptr<AssetSystem> mAssetSystem;
+    weak_ptr<AssetSystem>    mAssetSystem;
     weak_ptr<GraphicsSystem> mGraphicsSystem;
-    weak_ptr<PhysicsSystem> mPhysicsSystem;
+    weak_ptr<PhysicsSystem>  mPhysicsSystem;
-    weak_ptr<RenderLayer> mRenderLayer;
+    weak_ptr<RenderLayer>    mRenderLayer;
 
 public:
-    BallFactory(weak_ptr<AssetSystem> assetSystem,
+    BallFactory(weak_ptr<AssetSystem>    assetSystem,
                 weak_ptr<GraphicsSystem> graphicsSystem,
-                weak_ptr<PhysicsSystem> physicsSystem,
+                weak_ptr<PhysicsSystem>  physicsSystem,
-                weak_ptr<RenderLayer> renderLayer);
+                weak_ptr<RenderLayer>    renderLayer);
     virtual ~BallFactory();
 
     shared_ptr<Entity> createBall(const vec3 position,

src/entities/BallPhysicsComponent.h

@@ -12,6 +12,7 @@
 #include <memory>
 #include <cstdint>
 #include <string>
+
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 
@@ -35,10 +36,12 @@ using std::shared_ptr;
 using std::make_shared;
 using std::dynamic_pointer_cast;
 using std::string;
+
 using glm::vec3;
 using glm::mat4;
 using glm::translate;
 using glm::scale;
+
 using ecos::utility::getFloatInRange;
 using ecos::core::IDCache;
 using ecos::core::logging::Log;
@@ -52,6 +55,7 @@ using ecos::physics::TransformChangeMessage;
 using ecos::physics::CollisionStateChangeMessage;
 using ecos::physics::ColliderQueryMessage;
 
+///
 class BallPhysicsComponent:
         public ecos::physics::PhysicsComponent
 {

src/entities/BoxFactory.cpp

@@ -39,7 +39,7 @@ shared_ptr<Entity> BoxFactory::createBox(const vec3 position,
 
     // Add the ModelRenderable of a ball
     ModelRenderableFactory* modelFactory = new ModelRenderableFactory(mAssetSystem);
-    shared_ptr<ModelRenderable> modelRenderable = modelFactory->createModel("box-1x1x1.f3d",
+    shared_ptr<ModelRenderable> modelRenderable = modelFactory->createModel("box-1x1x1.bcosm",
                                                                             "box-1x1x1-albedo.png",
                                                                             "box-1x1x1-model");
     delete modelFactory;

src/entities/BoxFactory.h

@@ -13,6 +13,7 @@
 #include <memory>
 #include <functional>
 #include <vector>
+
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 
@@ -58,10 +59,12 @@ using std::dynamic_pointer_cast;
 using std::function;
 using std::bind;
 using std::vector;
+
 using glm::vec3;
 using glm::mat4;
 using glm::quat;
 using glm::translate;
+
 using ecos::utility::getShared;
 using ecos::core::IDCache;
 using ecos::core::logging::Log;
@@ -91,17 +94,18 @@ using ecos::graphics::ModelRenderable;
 using ecos::graphics::lighting::LightSource;
 using ecos::graphics::lighting::LightSourceFactory;
 
+///
 class BoxFactory
 {
 private:
-    weak_ptr<AssetSystem> mAssetSystem;
+    weak_ptr<AssetSystem>    mAssetSystem;
     weak_ptr<GraphicsSystem> mGraphicsSystem;
-    weak_ptr<RenderLayer> mRenderLayer;
+    weak_ptr<RenderLayer>    mRenderLayer;
 
 public:
-    BoxFactory(weak_ptr<AssetSystem> assetSystem,
+    BoxFactory(weak_ptr<AssetSystem>    assetSystem,
                weak_ptr<GraphicsSystem> graphicsSystem,
-               weak_ptr<RenderLayer> renderLayer);
+               weak_ptr<RenderLayer>    renderLayer);
     virtual ~BoxFactory();
 
     shared_ptr<Entity> createBox(const vec3 position,

src/entities/GoalFactory.cpp

@@ -9,10 +9,10 @@
 
 namespace JamSpook {
 
-GoalFactory::GoalFactory(weak_ptr<AssetSystem> assetSystem,
+GoalFactory::GoalFactory(weak_ptr<AssetSystem>    assetSystem,
                          weak_ptr<GraphicsSystem> graphicsSystem,
-                         weak_ptr<PhysicsSystem> physicsSystem,
+                         weak_ptr<PhysicsSystem>  physicsSystem,
-                         weak_ptr<RenderLayer> renderLayer):
+                         weak_ptr<RenderLayer>    renderLayer):
         mAssetSystem(assetSystem),
         mGraphicsSystem(graphicsSystem),
         mPhysicsSystem(physicsSystem),
@@ -31,7 +31,7 @@ shared_ptr<Entity> GoalFactory::createGoal(const vec3 position)
     mat4 transform = translate(mat4(1), position);
 
     // Add physics component
-    ColliderFactory* colliderFactory = new ColliderFactory(mPhysicsSystem);
+    ColliderFactory* colliderFactory = new ColliderFactory(mPhysicsSystem, mAssetSystem);
     shared_ptr<GoalPhysicsComponent> physicsComponent =
             make_shared<GoalPhysicsComponent>(
                     transform,
@@ -39,12 +39,13 @@ shared_ptr<Entity> GoalFactory::createGoal(const vec3 position)
                     getShared(mPhysicsSystem),
                     getShared(mPhysicsSystem),
                     getShared(mPhysicsSystem),
-                    colliderFactory->createBoxCollider(position,
+                    colliderFactory->createConvexHullCollider(position,
-                                                       quat(vec3(0,0,0)),
+                                                              quat(vec3(0,0,0)),
-                                                       vec3(10,1,10), // radius
+                                                              "goal.bcosp",  // filePath
-                                                       100.0f, // mass
+                                                              "goal-shape", // name
-                                                       entity,
+                                                              100.0f, // mass
-                                                       entity->getEntityTag()));
+                                                              entity,
+                                                              entity->getEntityTag()));
     delete colliderFactory;
     // Note: Editing of rigid body params, maybe only has effect is it has been added to the world.
     physicsComponent->getCollider()->getRigidBody()->setLinearFactor(btVector3(0, 0, 0));  // deny positional movement movement in any axis
@@ -59,9 +60,9 @@ shared_ptr<Entity> GoalFactory::createGoal(const vec3 position)
                                                                                      mRenderLayer);
     entity->addComponent(graphicsComponent);
 
-    // Add the ModelRenderable of a ball
+    // Add the ModelRenderable
     ModelRenderableFactory* modelFactory = new ModelRenderableFactory(mAssetSystem);
-    shared_ptr<ModelRenderable> modelRenderable = modelFactory->createModel("goal.f3d",
+    shared_ptr<ModelRenderable> modelRenderable = modelFactory->createModel("goal.bcosm",
                                                                             "goal.png",
                                                                             "goal-model");
     delete modelFactory;

src/entities/GoalFactory.h

@@ -12,6 +12,7 @@
 #include <memory>
 #include <functional>
 #include <vector>
+
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/string_cast.hpp>
@@ -58,9 +59,11 @@ using std::dynamic_pointer_cast;
 using std::function;
 using std::bind;
 using std::vector;
+
 using glm::vec3;
 using glm::mat4;
 using glm::quat;
+using glm::quat_cast;
 using glm::translate;
 using glm::scale;
 
@@ -95,20 +98,20 @@ using ecos::physics::PhysicsComponent;
 using ecos::physics::ColliderFactory;
 using ecos::physics::Collider;
 
-/// Factory to simplify jump180 entity creation
+/// Factory to simplify goal entity creation
 class GoalFactory
 {
 private:
-    weak_ptr<AssetSystem> mAssetSystem;
+    weak_ptr<AssetSystem>    mAssetSystem;
     weak_ptr<GraphicsSystem> mGraphicsSystem;
-    weak_ptr<PhysicsSystem> mPhysicsSystem;
+    weak_ptr<PhysicsSystem>  mPhysicsSystem;
-    weak_ptr<RenderLayer> mRenderLayer;
+    weak_ptr<RenderLayer>    mRenderLayer;
 
 public:
-    GoalFactory(weak_ptr<AssetSystem> assetSystem,
+    GoalFactory(weak_ptr<AssetSystem>    assetSystem,
                 weak_ptr<GraphicsSystem> graphicsSystem,
-                weak_ptr<PhysicsSystem> physicsSystem,
+                weak_ptr<PhysicsSystem>  physicsSystem,
-                weak_ptr<RenderLayer> renderLayer);
+                weak_ptr<RenderLayer>    renderLayer);
     virtual ~GoalFactory();
 
     /// Compose a jump180 entity

src/entities/GoalPhysicsComponent.h

@@ -34,6 +34,7 @@ using std::shared_ptr;
 using std::make_shared;
 using std::dynamic_pointer_cast;
 using std::string;
+
 using glm::vec3;
 using glm::mat4;
 using glm::translate;
@@ -51,6 +52,7 @@ using ecos::physics::TransformChangeMessage;
 using ecos::physics::CollisionStateChangeMessage;
 using ecos::physics::ColliderQueryMessage;
 
+///
 class GoalPhysicsComponent:
         public PhysicsComponent
 {

src/entities/Jump180Factory.cpp

@@ -9,10 +9,10 @@
 
 namespace JamSpook {
 
-Jump180Factory::Jump180Factory(weak_ptr<AssetSystem> assetSystem,
+Jump180Factory::Jump180Factory(weak_ptr<AssetSystem>    assetSystem,
                                weak_ptr<GraphicsSystem> graphicsSystem,
-                               weak_ptr<PhysicsSystem> physicsSystem,
+                               weak_ptr<PhysicsSystem>  physicsSystem,
-                               weak_ptr<RenderLayer> renderLayer):
+                               weak_ptr<RenderLayer>    renderLayer):
         mAssetSystem(assetSystem),
         mGraphicsSystem(graphicsSystem),
         mPhysicsSystem(physicsSystem),
@@ -48,7 +48,7 @@ shared_ptr<Entity> Jump180Factory::createJump180(const vec3 position,
 //    mat4 transform = translate(mat4(1), position);
 
     // Add physics component
-    ColliderFactory* colliderFactory = new ColliderFactory(mPhysicsSystem);
+    ColliderFactory* colliderFactory = new ColliderFactory(mPhysicsSystem, mAssetSystem);
     shared_ptr<Jump180PhysicsComponent> physicsComponent =
             make_shared<Jump180PhysicsComponent>(
                     transform,
@@ -56,12 +56,13 @@ shared_ptr<Entity> Jump180Factory::createJump180(const vec3 position,
                     getShared(mPhysicsSystem),
                     getShared(mPhysicsSystem),
                     getShared(mPhysicsSystem),
-                    colliderFactory->createBoxCollider(position,
+                    colliderFactory->createConvexHullCollider(position,
-                                                       quat_cast(rotation),
+                                                              quat_cast(rotation),
-                                                       vec3(10,1,10), // radius
+                                                              "jump180.bcosp",  // filePath
-                                                       100.0f, // mass
+                                                              "jump180-shape", // name
-                                                       entity,
+                                                              100.0f, // mass
-                                                       entity->getEntityTag()));
+                                                              entity,
+                                                              entity->getEntityTag()));
     delete colliderFactory;
     // Note: Editing of rigid body params, maybe only has effect is it has been added to the world.
     physicsComponent->getCollider()->getRigidBody()->setLinearFactor(btVector3(0, 0, 0));  // deny positional movement movement in any axis
@@ -78,7 +79,7 @@ shared_ptr<Entity> Jump180Factory::createJump180(const vec3 position,
 
     // Add the ModelRenderable of a ball
     ModelRenderableFactory* modelFactory = new ModelRenderableFactory(mAssetSystem);
-    shared_ptr<ModelRenderable> modelRenderable = modelFactory->createModel("jump180.f3d",
+    shared_ptr<ModelRenderable> modelRenderable = modelFactory->createModel("jump180.bcosm",
                                                                             "jump180.png",
                                                                             "jump180-model");
     delete modelFactory;

src/entities/Jump180Factory.h

@@ -12,6 +12,7 @@
 #include <memory>
 #include <functional>
 #include <vector>
+
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/euler_angles.hpp>
@@ -59,9 +60,11 @@ using std::dynamic_pointer_cast;
 using std::function;
 using std::bind;
 using std::vector;
+
 using glm::vec3;
 using glm::mat4;
 using glm::quat;
+using glm::quat_cast;
 using glm::translate;
 using glm::scale;
 using glm::rotate;
@@ -103,16 +106,16 @@ using ecos::physics::Collider;
 class Jump180Factory
 {
 private:
-    weak_ptr<AssetSystem> mAssetSystem;
+    weak_ptr<AssetSystem>    mAssetSystem;
     weak_ptr<GraphicsSystem> mGraphicsSystem;
-    weak_ptr<PhysicsSystem> mPhysicsSystem;
+    weak_ptr<PhysicsSystem>  mPhysicsSystem;
-    weak_ptr<RenderLayer> mRenderLayer;
+    weak_ptr<RenderLayer>    mRenderLayer;
 
 public:
-    Jump180Factory(weak_ptr<AssetSystem> assetSystem,
+    Jump180Factory(weak_ptr<AssetSystem>    assetSystem,
                    weak_ptr<GraphicsSystem> graphicsSystem,
-                   weak_ptr<PhysicsSystem> physicsSystem,
+                   weak_ptr<PhysicsSystem>  physicsSystem,
-                   weak_ptr<RenderLayer> renderLayer);
+                   weak_ptr<RenderLayer>    renderLayer);
     virtual ~Jump180Factory();
 
     /// Compose a jump180 entity

src/entities/Jump180PhysicsComponent.h

@@ -12,6 +12,7 @@
 #include <memory>
 #include <cstdint>
 #include <string>
+
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 
@@ -34,6 +35,7 @@ using std::shared_ptr;
 using std::make_shared;
 using std::dynamic_pointer_cast;
 using std::string;
+
 using glm::vec3;
 using glm::mat4;
 using glm::translate;
@@ -51,6 +53,7 @@ using ecos::physics::TransformChangeMessage;
 using ecos::physics::CollisionStateChangeMessage;
 using ecos::physics::ColliderQueryMessage;
 
+///
 class Jump180PhysicsComponent:
         public PhysicsComponent
 {

src/entities/LightInteractionComponent.h

@@ -33,6 +33,7 @@ using std::shared_ptr;
 using std::make_shared;
 using std::weak_ptr;
 using std::dynamic_pointer_cast;
+
 using glm::vec3;
 using glm::mat4;
 using glm::translate;

src/entities/LightPhysicsComponent.h

@@ -12,6 +12,7 @@
 #include <memory>
 #include <cstdint>
 #include <string>
+
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 
@@ -37,6 +38,7 @@ using std::shared_ptr;
 using std::make_shared;
 using std::dynamic_pointer_cast;
 using std::string;
+
 using glm::vec3;
 using glm::mat4;
 using glm::translate;

src/entities/LightingFactory.h

@@ -13,6 +13,7 @@
 #include <memory>
 #include <functional>
 #include <vector>
+
 #include <glm/glm.hpp>
 #include <glm/gtc/matrix_transform.hpp>
 #include <glm/gtx/euler_angles.hpp>
@@ -64,6 +65,7 @@ using std::dynamic_pointer_cast;
 using std::function;
 using std::bind;
 using std::vector;
+
 using glm::vec3;
 using glm::mat4;
 using glm::quat;
@@ -108,6 +110,7 @@ using ecos::interaction::InteractionSystem;
 using ecos::interaction::InputDeviceState;
 using ecos::interaction::InteractionComponent;
 
+///
 class LightingFactory
 {
 private: