Bläddra i källkod

BATTLE RATTLE;

bjornbytes 9 år sedan
förälder
incheckning
91f35d66d5
2 ändrade filer med 6 tillägg och 2 borttagningar
  1. 5 1
      app/rattle.lua
  2. 1 1
      main.lua

+ 5 - 1
app/rattle.lua

@@ -2,6 +2,9 @@ local rattle = {}
 local controllers = require 'app/controllers'
 local vec3 = require('lib/cpml').vec3
 
+rattle.model = lovr.graphics.newModel('art/rattle.obj')
+rattle.model:setTexture(lovr.graphics.newTexture('art/rattle_DIFF.png'))
+
 function rattle:init()
   self.lastPosition = nil
   self.shake = 0
@@ -33,7 +36,8 @@ function rattle:draw()
     local x, y, z = controller:getPosition()
     local angle, ax, ay, az = controller:getOrientation()
     lovr.graphics.setColor(255, 255, 255)
-    lovr.graphics.cube('line', x, y, z, .1 + self.shake * 4, -angle, ax, ay, az)
+    -- lovr.graphics.cube('line', x, y, z, .1 + self.shake * 4, -angle, ax, ay, az)
+    self.model:draw(x, y, z, .01 + self.shake * .015, -angle, ax, ay, az)
   end
 end
 

+ 1 - 1
main.lua

@@ -4,7 +4,7 @@ local cry = require 'app/cry'
 local sleep = require 'app/sleep'
 local menu = require 'app/menu'
 local controllers = require 'app/controllers'
-local state = cry
+local state = menu
 
 function lovr.load()
   controllers:init()