MEGA COMMIT:

- Added C++ version of the trigger system that works for most levels - Updated physics engine to use bump allocator for internal allocations - Updated project to latest MSVC version - Updated framerate to 30fps - Various other improvements and incomplete changes
HourglassGame · Apr 1, 2018 · aa3445a · aa3445a
1 parent 75e0c07
commit aa3445a
Show file tree

Hide file tree

Showing 105 changed files with 4,983 additions and 638 deletions.
diff --git a/data/SimpleConfiguredProxyLuaGlobals/basicTriggerSystem.lua b/data/SimpleConfiguredProxyLuaGlobals/basicTriggerSystem.lua
@@ -0,0 +1,87 @@
+local function cloneAttachment(a)
+    return {platform = a.platform, xOffset = a.xOffset, yOffset = a.yOffset}
+end
+
+local function momentarySwitch(p)
+    return {
+        type = 'momentarySwitch',
+        timeDirection = p.timeDirection,
+        attachment = cloneAttachment(p.attachment),
+        width = p.width,
+        height = p.height,
+        triggerID = p.triggerID,
+        stateTriggerID = p.stateTriggerID,
+        extraTriggerIDs = p.extraTriggerIDs,
+    }
+end
+
+local function stickySwitch(p)
+    return {
+        type = 'stickySwitch',
+        timeDirection = p.timeDirection,
+        attachment = cloneAttachment(p.attachment),
+        width = p.width,
+        height = p.height,
+        triggerID = p.triggerID,
+        stateTriggerID = p.stateTriggerID,
+        extraTriggerIDs = p.extraTriggerIDs,
+    }
+end
+
+local function pickup(p)
+    return {
+        type = 'pickup',
+        timeDirection = p.timeDirection,
+        attachment = cloneAttachment(p.attachment),
+        width = p.width,
+        height = p.height,
+        pickupType = p.pickupType,
+        triggerID = p.triggerID,
+        pickupNumber = p.pickupNumber,
+    }
+end
+local function spikes(p)
+    return {
+        type = 'spikes',
+        timeDirection = p.timeDirection,
+        attachment = cloneAttachment(p.attachment),
+        width = p.width,
+        height = p.height,
+    }
+end
+local function wireGlitz(p)
+end
+local function easyWireGlitz(p)
+end
+local function basicRectangleGlitz(p)
+end
+local function basicTextGlitz(p)
+end
+local function calculatePhysicsAffectingStuff(tempStore)
+    return tempStore
+end
+local function getDepartureInformation(tempStore)
+    return tempStore
+end
+local function mutateObject(tempStore)
+    return tempStore
+end
+return {
+    momentarySwitch = momentarySwitch,
+    --toggleSwitch = toggleSwitch,
+    stickySwitch = stickySwitch,
+    --stickyLaserSwitch = stickyLaserSwitch,
+    --multiStickySwitch = multiStickySwitch,
+    pickup = pickup,
+    spikes = spikes,
+    --boxOMatic = boxOMatic,
+    wireGlitz = wireGlitz,
+    easyWireGlitz = easyWireGlitz,
+    basicRectangleGlitz = basicRectangleGlitz,
+    basicTextGlitz = basicTextGlitz,
+    mutateObject = mutateObject,
+    calculatePhysicsAffectingStuff = calculatePhysicsAffectingStuff,
+    getDepartureInformation = getDepartureInformation,
+    --calculateBidirectionalGlitz = calculateBidirectionalGlitz,
+    --timeDirectionToInt = timeDirectionToInt,
+}
diff --git a/data/basicTriggerSystem.lua b/data/basicTriggerSystem.lua
@@ -84,7 +84,7 @@ local function calculateCollisions(protoCollisions, triggerArrivals, outputTrigg
                 if math.abs(velocity) <= deceleration then
                     velocity = 0
                 else
-                    velocity = velocity + (math.abs(velocity)/velocity)*deceleration
+                    velocity = velocity + sign(velocity)*deceleration
                end
             end
             local maxSpeed = destination.maxSpeed
@@ -152,8 +152,8 @@ local function snapAttachment(objectTimeDirection, attachment, collisions)
     return x, y, xspeed, yspeed
 end
 
-local function calculatePortals(forwardsGlitz, reverseGlitz, protoPortals, protoLasers, collisions, triggerArrivals, frameNumber)
-    local function calculatePortal(protoPortal, collisions, isLaser)
+local function calculatePortals(forwardsGlitz, reverseGlitz, protoPortals, collisions, triggerArrivals, frameNumber)
+    local function calculatePortal(protoPortal, collisions)
         local x, y, xspeed, yspeed =
             snapAttachment(protoPortal.timeDirection, protoPortal.attachment, collisions)
 
@@ -178,7 +178,7 @@ local function calculatePortals(forwardsGlitz, reverseGlitz, protoPortals, proto
             destinationDirection = protoPortal.destinationDirection or 'forwards',
             illegalDestination = protoPortal.illegalDestination,
             fallable = protoPortal.fallable,
-			isLaser = isLaser,
+			isLaser = (protoPortal.isLaser or false),
             winner = false
         }
 
@@ -252,15 +252,17 @@ local function calculatePortals(forwardsGlitz, reverseGlitz, protoPortals, proto
     local arrivalLocations = {}
 
     for i, protoPortal in ipairs(protoPortals) do
-        local portal, active = calculatePortal(protoPortal, collisions, false)
-        calculatePortalGlitz(portal, forwardsGlitz, reverseGlitz, active)
+        local portal, active = calculatePortal(protoPortal, collisions)
+        if not protoPortal.isLaser then
+            calculatePortalGlitz(portal, forwardsGlitz, reverseGlitz, active)
+        end
         arrivalLocations[#arrivalLocations + 1] = calculateArrivalLocation(portal)
         if active then
             portalCount = portalCount + 1
             portals[portalCount] = portal
         end
     end
-
+	--[[
 	if protoLasers then
 		for i, protoLaser in ipairs(protoLasers) do
 			local portal, active = calculatePortal(protoLaser, collisions, true)
@@ -271,7 +273,7 @@ local function calculatePortals(forwardsGlitz, reverseGlitz, protoPortals, proto
 			end
 		end
 	end
-
+	]]--
     return portals, arrivalLocations
 end
 
@@ -864,7 +866,7 @@ local function pickup(p)
                 local forwardsImageGlitz = {
                     type = "image",
                     layer = 430,
-                    key = pickupGlitzNameMap[p.pickupType],
+                    key = pickupGlitzNameMap[proto.pickupType],
                     x = PnV.x,
                     y = PnV.y,
                     width = proto.height,
@@ -874,7 +876,7 @@ local function pickup(p)
                 local reverseImageGlitz = {
                     type = "image",
                     layer = 430,
-                    key = pickupGlitzNameMap[p.pickupType],
+                    key = pickupGlitzNameMap[proto.pickupType],
                     x = PnV.x,
                     y = PnV.y,
                     width = proto.height,
@@ -936,6 +938,8 @@ local function spikes(p)
                 deathGlitz[#deathGlitz+1] = {
                     x = dynamicObject.x,
                     y = dynamicObject.y,
+                    xspeed = dynamicObject.xspeed,
+                    yspeed = dynamicObject.yspeed,
                     width = dynamicObject.width,
                     height = dynamicObject.height,
                     timeDirection = dynamicObject.timeDirection
@@ -1133,7 +1137,7 @@ function calculatePhysicsAffectingStuff(tempStore)
 			tempStore.forwardsGlitz, 
 			tempStore.reverseGlitz, 
 			tempStore.protoPortals, 
-			tempStore.protoLasers, 
+			--tempStore.protoLasers, 
 			retv.collisions, 
 			triggerArrivals, 
 			tempStore.frameNumber
@@ -1167,11 +1171,12 @@ function calculatePhysicsAffectingStuff(tempStore)
 end
 
 local function mutateObject(tempStore)
-    return function(responsibleManipulatorIndices, dynamicObject)
-        for i in list_iter(responsibleManipulatorIndices) do
-            if dynamicObject then
-                dynamicObject = tempStore.activeMutators[i]:effect(dynamicObject)
+    return function(responsibleMutatorIndices, dynamicObject)
+        for i in list_iter(responsibleMutatorIndices) do
+            if not dynamicObject then
+                break
             end
+            dynamicObject = tempStore.activeMutators[i]:effect(dynamicObject)
         end
         return dynamicObject
     end

diff --git a/data/levels/0Level.lvl/triggerSystem.lua b/data/levels/0Level.lvl/triggerSystem.lua
@@ -20,7 +20,28 @@ local tempStore =
             fallable = false,
             winner = true
         },
+        {
+            attachment = {xOffset = 6 * 3200, yOffset = 6 * 3200},
+            index = 2,
+            xaim = 5 * 3200,
+            yaim = 20 * 3200,
+            collisionOverlap = 50,
+            timeDirection = 'forwards',
+            destinationIndex = nil,
+            xDestination = 0,
+            yDestination = 0,
+            relativeTime = true,
+            timeDestination = -600,
+            illegalDestination = 1,
+            fallable = false,
+            winner = false,
+            isLaser = true,
+			triggerFunction = function(triggerArrivals, frameNumber)
+				return triggerArrivals[1][1] == 1
+			end
+        },
     },
+    --[[
     protoLasers =
     {
         {
@@ -43,6 +64,7 @@ local tempStore =
 			end
         },
     },
+    ]]--
     protoCollisions = {
         {
             width = 3 * 3200,

diff --git a/data/levels/13FishInABarrel.lvl/main.lua b/data/levels/13FishInABarrel.lvl/main.lua
@@ -51,7 +51,7 @@ initialArrivals =
 }
 triggerSystem =
 {
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     system = [==[require "triggerSystem"]==],

diff --git a/data/levels/19Impossibru.lvl/main.lua b/data/levels/19Impossibru.lvl/main.lua
@@ -49,7 +49,7 @@ initialArrivals =
 }
 triggerSystem =
 {
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     system = [==[require "triggerSystem"]==],

diff --git a/data/levels/19a_Really_Impossibru.lvl/main.lua b/data/levels/19a_Really_Impossibru.lvl/main.lua
@@ -49,7 +49,7 @@ initialArrivals =
 }
 triggerSystem =
 {
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     system = [==[require "triggerSystem"]==],

diff --git a/data/levels/1EasyStart.lvl/main.lua b/data/levels/1EasyStart.lvl/main.lua
@@ -49,7 +49,7 @@ triggerSystem =
     --DirectLua does a minimum amount of work in C++, before calling
     --Lua with the same arguments and expecting the same return values
     --as the TriggerSystem in C++
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     --This describes a lua chunk which will be loaded by TriggerFrameState

diff --git a/data/levels/1EasyStart.lvl/triggerSystem.lua b/data/levels/1EasyStart.lvl/triggerSystem.lua
@@ -107,8 +107,6 @@ end
 function shouldPort(responsiblePortalIndex, dynamicObject, porterActionedPortal) 
     return true
 end
-function mutateObject(responsibleManipulatorIndices, dynamicObject)
-    return dynamicObject
-end
+mutateObject = bts.mutateObject(tempStore)
 
 getDepartureInformation = bts.getDepartureInformation(tempStore)
diff --git a/data/levels/21WhichWay.lvl/main.lua b/data/levels/21WhichWay.lvl/main.lua
@@ -42,10 +42,7 @@ initialArrivals =
 }
 triggerSystem = 
 {
-    --DirectLua does a minimum amount of work in C++, before calling
-    --Lua with the same arguments and expecting the same return values
-    --as the TriggerSystem in C++
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     --This describes a lua chunk which will be loaded by TriggerFrameState

diff --git a/data/levels/22AnotherBoxPuzzle.lvl/main.lua b/data/levels/22AnotherBoxPuzzle.lvl/main.lua
@@ -45,10 +45,7 @@ initialArrivals =
 }
 triggerSystem = 
 {
-    --DirectLua does a minimum amount of work in C++, before calling
-    --Lua with the same arguments and expecting the same return values
-    --as the TriggerSystem in C++
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     --This describes a lua chunk which will be loaded by TriggerFrameState

diff --git a/data/levels/25Shafted.lvl/main.lua b/data/levels/25Shafted.lvl/main.lua
@@ -48,7 +48,7 @@ initialArrivals =
 }
 triggerSystem =
 {
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     system = [==[require "triggerSystem"]==],

diff --git a/data/levels/2OpenAndClosed.lvl/main.lua b/data/levels/2OpenAndClosed.lvl/main.lua
@@ -46,7 +46,7 @@ initialGuy =
 }
 triggerSystem =
 {
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     system = [==[ require "triggerSystem" ]==],

diff --git a/data/levels/31UpsAndDowns.lvl/main.lua b/data/levels/31UpsAndDowns.lvl/main.lua
@@ -46,7 +46,7 @@ initialArrivals =
 }
 triggerSystem =
 {
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     system = [==[require "triggerSystem"]==],

diff --git a/data/levels/33Upsypupsy.lvl/main.lua b/data/levels/33Upsypupsy.lvl/main.lua
@@ -48,7 +48,7 @@ initialArrivals =
 }
 triggerSystem =
 {
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     system = [==[require "triggerSystem"]==],

diff --git a/data/levels/38SomethingMissing.lvl/main.lua b/data/levels/38SomethingMissing.lvl/main.lua
@@ -42,10 +42,7 @@ initialArrivals =
 }
 triggerSystem = 
 {
-    --DirectLua does a minimum amount of work in C++, before calling
-    --Lua with the same arguments and expecting the same return values
-    --as the TriggerSystem in C++
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     --This describes a lua chunk which will be loaded by TriggerFrameState

diff --git a/data/levels/3StandardBoxPuzzle.lvl/main.lua b/data/levels/3StandardBoxPuzzle.lvl/main.lua
@@ -51,7 +51,7 @@ initialArrivals =
 }
 triggerSystem =
 {
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     system = [==[ require "triggerSystem" ]==],

diff --git a/data/levels/40TooHigh.lvl/main.lua b/data/levels/40TooHigh.lvl/main.lua
@@ -40,7 +40,7 @@ initialArrivals =
 }
 triggerSystem =
 {
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     system = [==[ require "triggerSystem" ]==],

diff --git a/data/levels/44Widdershins.lvl/main.lua b/data/levels/44Widdershins.lvl/main.lua
@@ -48,7 +48,7 @@ initialArrivals =
 }
 triggerSystem =
 {
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     system = [==[require "triggerSystem"]==],

diff --git a/data/levels/4NotSoStandard.lvl/main.lua b/data/levels/4NotSoStandard.lvl/main.lua
@@ -50,7 +50,7 @@ initialArrivals =
 }
 triggerSystem =
 {
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     system = [==[ require "triggerSystem" ]==],

diff --git a/data/levels/6StackedHigh.lvl/main.lua b/data/levels/6StackedHigh.lvl/main.lua
@@ -50,7 +50,7 @@ initialArrivals =
 }
 triggerSystem =
 {
-    type = "DirectLua",
+    type = "CompatibleLua",
 
     luaFiles = {"triggerSystem", "global.basicTriggerSystem"},
     system = [==[ require "triggerSystem" ]==],