feat: add terrain support for 3D worlds

framework/scenes/world/init.lua

@@ -31,6 +31,7 @@ local Bump3D   = require("framework.libs.bump-3dpd")
 local Sti      = require("framework.scenes.world.maps.tiled")
 
 local Camera = require("framework.scenes.world.camera.minimal")
+local Terrain = require("framework.scenes.world.terrain")
 
 local Vector3D = require "framework.libs.brinevector3D"
 
@@ -93,12 +94,18 @@ function World:draw()
     end
 end
 
+function World:drawMap(id)
+  if (self.map ~= nil) then
+    self.map:draw()
+  end
+end
+
 function World:drawUpperLayers()
     if (self.map ~= nil) then
       self.map:drawUpperLayers()
     end
   end
-  
+
   function World:drawLowerLayers()
     if (self.map ~= nil) then
       self.map:drawLowerLayers()
@@ -267,6 +274,9 @@ function World:newCollision(name, x, y, z, w, h, d)
         isSolid = bodyDef.isSolid,
     }
     self:registerBody(body)
+    if (bodyDef.mapTexture == true) then
+        self:addTerrain(body)
+    end
 end
 
 function World:registerBody(body)
@@ -298,6 +308,10 @@ function World:getBodiesInCube(x, y, z, w, h, d)
 -- Shape handling
 -- Handle shapes, which make know what object is visible or not
 
+function World:addTerrain(body)
+    self:registerShape(Terrain(self, body.position, body.dimensions))
+end
+
 function World:registerShape(actor)
     local position, dimensions = actor:getShape()
     return self.shapes:add(actor, position.x, position.y, dimensions.w, dimensions.h)

framework/scenes/world/maps/tiled/init.lua

@@ -50,6 +50,9 @@ end
 -- DRAW FUNCTIONS
 -- Handle drawing the wrapper
 
+function TiledMap:draw()
+    self.wrapper:draw()
+end
 
 function TiledMap:drawUpperLayers()
     self.wrapper:drawUpperLayers()

framework/scenes/world/maps/tiled/stiwrapper.lua

@@ -212,6 +212,12 @@ end
 -- DRAW FUNCTIONS
 -- Draw the map
 
+function StiWrapper:draw()
+    for i = 1, #self.sti.layers, 1 do
+        self:drawLayer(i)
+    end
+end
+
 function StiWrapper:drawUpperLayers()
     self:lazyLoad()
     if (self.objectlayer > 0) then

framework/scenes/world/terrain.lua

@@ -0,0 +1,65 @@
+-- mapped.lua :: a sti-mapped box
+
+--[[
+  Copyright © 2019 Kazhnuz
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy of
+  this software and associated documentation files (the "Software"), to deal in
+  the Software without restriction, including without limitation the rights to
+  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+  the Software, and to permit persons to whom the Software is furnished to do so,
+  subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in all
+  copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+]]
+
+local MappedBox = extend "framework.scenes.world.actors.visuals.boxes"
+local Vector3D = require "framework.libs.brinevector3D"
+
+function MappedBox:new(world, position, dimensions)
+  self.world = world
+  self.position = Vector3D(position.x, position.y, position.z or 0)
+
+  MappedBox.super.new(self, dimensions)
+  self.haveLine = false
+end
+
+function MappedBox:drawTextureContent()
+  local tx, ty = self.position.x, self.position.y - (self.position.z + self.dimensions.d)
+  core.debug:print("mappedbox", "getting map layers at position " .. tx .. ";" .. ty)
+  love.graphics.push()
+  love.graphics.origin()
+  love.graphics.translate(math.floor(-tx), math.floor(-ty))
+
+  self.world:drawMap()
+
+  love.graphics.pop()
+end
+
+function MappedBox:getShape()
+  local position = self.position:clone()
+  local dimensions = {
+      w = self.dimensions.w,
+      h = self.dimensions.h,
+      d = self.dimensions.d
+  }
+
+  position.y = (position.y - position.z) - self.dimensions.d
+  dimensions.h = self.dimensions.h + self.dimensions.d
+  return position, dimensions
+end
+
+function MappedBox:draw()
+  MappedBox.super.draw(self, self.position)
+end
+
+
+return MappedBox