From 29c1e247d284c1beb21d998bc4d776155d242dbb Mon Sep 17 00:00:00 2001 From: Paul Liverman Date: Fri, 16 Jan 2015 15:25:48 -0800 Subject: [PATCH] hat --- source-images/hat1/hat1.png | Bin 0 -> 243 bytes source-images/hat1/hat1.xcf | Bin 0 -> 1053 bytes src/Hat.lua | 21 +++++++++++++++++++++ src/images/hat1.png | Bin 0 -> 243 bytes src/main.lua | 5 +++++ 5 files changed, 26 insertions(+) create mode 100644 source-images/hat1/hat1.png create mode 100644 source-images/hat1/hat1.xcf create mode 100644 src/Hat.lua create mode 100644 src/images/hat1.png diff --git a/source-images/hat1/hat1.png b/source-images/hat1/hat1.png new file mode 100644 index 0000000000000000000000000000000000000000..ad30c7b19d7d691490b07c828b88c40e71cf3003 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^;y}#9!3HEdt<`=2DYhhUcNd2LAh=-f^2tCE&H|6f zVg?4jBOuH;Rhv&5D9B#o>FdgVpHV0aAk+`4DmPv)Xmof%VS6fXd}g~8L+&t;ucLK6UWL{*jm literal 0 HcmV?d00001 diff --git a/source-images/hat1/hat1.xcf b/source-images/hat1/hat1.xcf new file mode 100644 index 0000000000000000000000000000000000000000..90c967e5f10b47f9f32e59d688a4a0e75dac79dc GIT binary patch literal 1053 zcmZ`&OHSiJ5UqBw2_`@o?D2+$H%MWTD3Qno(A>dmC)mbPeu@JEA7JFG%n`hsd(DKN zSN$0UO{S!Bz4xlSUfZ1%<#H3h&GR@f7a1WUWRC&j8Yu)GH^}bePw$QsI6$5t9pqPo zd0mM0kEs0uV~6E3EwW*;EuSC}`ho`4?tPKP)p}7r-TQ;Qn6DS>Z9GtAxGiRBJRXfz z903#4y2sYpk*&5L{~z$yw`!Bl%T*CitQW-hW1`W9FROAFm#g`6R`LFIo>$rK?*V!D zzmiryZ{_dc73p%BnlD1Zc=RxRm`?ROtLKD!Cd3bmQ0>+5mp*$=caza(RdAoLfx|=c zwMb;wV71s_6uLdY{sBHez(|2YD*n?xO^ZHqHzBBjb zM3sK{R`)7pe(etvT1MquH7K)wFHXc3M^Cso}2SuASJr7^`Os z88ty0HE>MT{fdFR+BHTlTGca_u2F}bnn!!0t6jha-6?YTO;jAYnF2?HFa1Mhc j3Vr&J_)9zT3!TV5dGeCFvWElt)RSGhlpgh^L*L{d3aKD? literal 0 HcmV?d00001 diff --git a/src/Hat.lua b/src/Hat.lua new file mode 100644 index 0000000..e156445 --- /dev/null +++ b/src/Hat.lua @@ -0,0 +1,21 @@ +local class = require "lib.middleclass" + +local Hat = class('Hat') + +function Hat:initialize(imgFile, imgScale, offset, imgColor) + -- image stuff + self.image = love.graphics.newImage(imgFile) or love.graphics.newImage("images/no_hat.png") and console.e("Hat created with no image.") + self.imgHalfWidth = self.image:getWidth() / 2 + self.imgHalfHeight = self.image:getHeight() / 2 + self.imgScale = imgScale or 1 and console.d("Hat created with no scale.") + self.imgColor = imgColor or {255, 255, 255} and console.d("Hat created with no color (this is fine and normal).") + + self.offset = offset or 0 and console.d("Hat created with no offset.") +end + +function Hat:draw(x, y) + love.graphics.setColor(self.imgColor) + love.graphics.draw(self.image, x + player.Ship.x, y + player.Ship.y + self.offset, 0, self.imgScale, self.imgScale, self.imgHalfWidth, self.imgHalfHeight) +end + +return Hat diff --git a/src/images/hat1.png b/src/images/hat1.png new file mode 100644 index 0000000000000000000000000000000000000000..ad30c7b19d7d691490b07c828b88c40e71cf3003 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^;y}#9!3HEdt<`=2DYhhUcNd2LAh=-f^2tCE&H|6f zVg?4jBOuH;Rhv&5D9B#o>FdgVpHV0aAk+`4DmPv)Xmof%VS6fXd}g~8L+&t;ucLK6UWL{*jm literal 0 HcmV?d00001 diff --git a/src/main.lua b/src/main.lua index 1aa4192..4576b76 100644 --- a/src/main.lua +++ b/src/main.lua @@ -18,6 +18,8 @@ Render = { } player = require "Ships.Demo" +local Hat = require "Hat" +local lolhat = Hat("images/hat1.png", 1.6, -20, {255, 255, 255}) function love.update(dt) -- player rotation input @@ -136,6 +138,9 @@ function love.draw() end end + -- lolhat draw + lolhat:draw(Camera.x, Camera.y) + -- Fuel UI draw love.graphics.setColor(175, 255, 255) love.graphics.setFont(Render.hudFont)