Allow offset on fillArm to be in range (#34)

stijnwop · Feb 13, 2018 · 70d5669 · 70d5669
1 parent d782813
commit 70d5669
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/specializations/HoseSystemFillTriggerInteractive.lua b/specializations/HoseSystemFillTriggerInteractive.lua
@@ -67,7 +67,7 @@ function HoseSystemFillTriggerInteractive:update(dt)
                 raycast(x, y, z, gp.raycastNode, self, 1)
 
                 if self.object.lastRaycastDistance ~= 0 then
-                    local isUnderFillplane, planeY = self.object.lastRaycastObject:checkPlaneY(y)
+                    local isUnderFillplane, planeY = self.object.lastRaycastObject:checkPlaneY(y, { x, y, z })
 
                     if isUnderFillplane and HoseSystemFillTriggerInteractive:allowFillTypeAffectDirtMask(self.object.lastRaycastObject.fillType) then
                         -- Todo: make this direction based!
@@ -186,7 +186,7 @@ function HoseSystemFillTriggerInteractive:fillableObjectRaycastCallback(transfor
                             if vehicle:allowFillType(fillType) then
                                 self.object.lastRaycastObject = vehicle
                                 self.object.lastRaycastDistance = distance
-                                print("found trailer")
+
                                 return false
                             end
                         end

diff --git a/specializations/vehicles/strategies/HoseSystemArmStrategy.lua b/specializations/vehicles/strategies/HoseSystemArmStrategy.lua
@@ -29,7 +29,8 @@ end
 -- @param entry
 --
 function HoseSystemArmStrategy:load(xmlFile, key, entry)
---    entry.needsTransfer = Utils.getNoNil(getXMLBool(xmlFile, key .. '#needsTransfer'), false)
+    entry.offset = Utils.getNoNil(getXMLFloat(xmlFile, key .. '#offset'), 0)
+
     self.object.supportedFillTypes = {}
 
     local fillTypeCategories = getXMLString(xmlFile, key .. '#supportedFillTypeCategories')