Added a clipping mode (for testing!)

This allows walking through solid objects. It can be enabled and disabled using StartClipping() and StopClipping() in the debug console. It should not be used in any actual scripts.

4 files changed, 22 insertions, 4 deletions

@@ -284,3 +284,19 @@ end
 function RemoveExpression(spriteName)
   DestroyNamedSprite(AliasForSpriteExpression(spriteName))
 end
+
+--- Turns on clipping for the player.
+-- This allows walking through solid objects. For debug only!
+function StartClipping()
+  local playerId = getPlayerSprite()
+  local playerSprite = getSprite(playerId)
+  playerSprite.clipping = true
+end
+
+--- Turns off clipping for the player.
+-- For debug only!
+function StopClipping()
+  local playerId = getPlayerSprite()
+  local playerSprite = getSprite(playerId)
+  playerSprite.clipping = false
+end
@@ -117,7 +117,7 @@ void CharacterSystem::tick(double dt) {
         CollisionResult collision = game_.getSystem<TransformSystem>().checkCollision(spriteId, pLoc, sprite.dir);
         bool blocked = collision.horiz.blocked || collision.vert.blocked;
 
-        if (collision.horiz.blocked) {
+        if (collision.horiz.blocked && !sprite.clipping) {
           pLoc.x() = sprite.loc.x();//(newColPosDR * map.getTileSize() - (collisionBox / 2)).x() - 1;
         } else if (collision.horiz.colliderSprite != -1) {
           Sprite& collider = game_.getSprite(collision.horiz.colliderSprite);
@@ -127,7 +127,7 @@ void CharacterSystem::tick(double dt) {
           }
         }
 
-        if (collision.vert.blocked) {
+        if (collision.vert.blocked && !sprite.clipping) {
           pLoc.y() = sprite.loc.y();//(newColPosDR * map.getTileSize() - (collisionBox / 2)).x() - 1;
         } else if (collision.vert.colliderSprite != -1) {
           Sprite& collider = game_.getSprite(collision.vert.colliderSprite);
@@ -137,7 +137,7 @@ void CharacterSystem::tick(double dt) {
           }
         }
 
-        if (blocked && sprite.characterState == CharacterState::Running) {
+        if (blocked && sprite.characterState == CharacterState::Running && !sprite.clipping) {
           stopRunning(spriteId);
           game_.getMixer().playSound("../res/sfx/bump.wav");
         }
@@ -37,7 +37,8 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
       return sprite.frames[sprite.animations[sprite.animationId].frameIndices[sprite.animationFrame]];
     },
     "persistent", &Sprite::persistent,
-    "paused", &Sprite::paused);
+    "paused", &Sprite::paused,
+    "clipping", &Sprite::clipping);
 
   engine_.new_usertype<MessageSystem>(
     "message",
@@ -77,6 +77,7 @@ public:
   CharacterState characterState = CharacterState::Still;
   StepType stepType = StepType::none;
   int runningSfxChannel = -1;
+  bool clipping = false;
 
   // Input
   bool controllable = false;