add Rect, begin work on multiselect

code/camera.lua

@@ -77,3 +77,16 @@ function Camera:positionAt(x,y)
 	self.pos.y = math.floor((y/self.height)*self.height)
 end
 
+-- translate screen coordinates to game coordinates
+function Camera:ptScreenToGame(pt)
+	return self.pos + pt
+end
+
+function Camera:mouseScreenPos()
+	return Point:new(love.mouse.getX(),love.mouse.getY()) / game.scale
+end
+
+-- return the mouse position as game coordinates
+function Camera:mouseGamePos()
+	return self:ptScreenToGame(self:mouseScreenPos())
+end

code/collision.lua

@@ -88,3 +88,7 @@ function Collision:draw(color)
 	love.graphics.setColor(0,1,90,0.5)
 	love.graphics.rectangle("line",self.from.x-Camera.pos.x, self.from.y-Camera.pos.y, self.width, self.height)
 end
+
+function Collision:asRect()
+	return Rect:fromCoords(self.from.x, self.from.y, self.to.x, self.to.y)
+end

code/editor.lua

@@ -1,17 +1,36 @@
 assert(editor == nil)
 editor = {
+	active = false,
 	room_mode = false,
-	--palette_mode = false,
 	palette = {
 		active = false,
 		scroll = Point:new(0, 0),
 	},
+	multiselect = {
+		active = false,
+		sweeping = false,
+		box = nil,
+	},
 	pan = { fixed = false, speed = 3 },
 }
 
 function stepEditor()
 	
 	animateTiles()
+	local osweep = editor.multiselect.sweeping
+	editor.multiselect.sweeping = love.mouse.isDown(2)
+	frameDebug("sweeping: "..tostring(editor.multiselect.sweeping))
+	if editor.multiselect.sweeping and not editor.multiselect.active then
+		print("multiselect enabled")
+		editor.multiselect.active = true
+	end
+	if not osweep and osweep ~= editor.multiselect.sweeping then
+		editor.multiselect.box = nil
+	end
+	if editor.multiselect.active then
+		doEditorMultiselect()
+	end
+	
 	if Keybind:checkPressed(Keybind.editor.room_mode) then
 		if love.keyboard.isDown("lshift") then
 			editor.room_mode = "delete"
@@ -89,13 +108,6 @@ function stepEditor()
 				end,
 		}):activate()
 	end
-
-	if Keybind:checkPressed(Keybind.debug.editor) then
-		editor_mode = not editor_mode
-		deselectSpawns()
-		createTileObjects()
-		restartGame()
-	end
 end
 
 function scrollEditor(y)
@@ -128,6 +140,10 @@ function drawEditor()
 	if editor.palette.active then
 		doEditorPalette()
 	end
+	if editor.multiselect.box ~= nil then
+		frameDebug("drawing multiselect "..tostring(editor.multiselect.box))
+		drawEditorMultiselect()
+	end
 end
 
 function doEditorEdit()
@@ -354,6 +370,25 @@ end
 function drawEditorRooms()
 	for _, room in pairs(LoadedObjects.Rooms) do
 		love.graphics.setColor(0,0,100,1)
-		love.graphics.rectangle("line",room.from.x-Camera.pos.x, room.from.y-Camera.pos.y, room.width, room.height)
+		room:asRect():draw("line")
+		--love.graphics.rectangle("line",room.from.x-Camera.pos.x, room.from.y-Camera.pos.y, room.width, room.height)
 	end
 end
+
+function drawEditorMultiselect()
+	love.graphics.setColor(100,100,50,1)
+	editor.multiselect.box:draw("line")	
+end
+
+function doEditorMultiselect()
+	local mousept = Camera:mouseGamePos()
+	if editor.multiselect.box == nil then
+		print("sweep started")
+		editor.multiselect.box = Rect:fromPoints(mousept, mousept)
+		print("box: "..tostring(editor.multiselect.box))
+	elseif editor.multiselect.sweeping then
+		editor.multiselect.box.max = mousept
+		frameDebug("swept to "..tostring(mousept))
+	end
+end
+

code/game.lua

@@ -53,10 +53,6 @@ function stepGame()
 			initMenu("dialog",dialog_sequence.example)
 	end
 
-	if Keybind:checkPressed(Keybind.debug.editor) then
-		editor_mode = true
-	end
-
 	if Keybind:checkPressed(Keybind.debug.recording) then
 		if DemoRecording then
 			Demo:endRecord()

code/rect.lua

@@ -0,0 +1,75 @@
+-- based of of plan9's Rectangle struct
+-- rect.max is not counted as "in" the rectangle
+Rect = {}
+Rect.__index = Rect
+
+function Rect:fromPoints(pt1, pt2)
+	local o = { min = pt1, max = pt2 }
+	setmetatable(o, self)
+	return o
+end
+
+function Rect:fromCoords(x1, y1, x2, y2)
+	return Rect:fromPoints(Point:new(x1, y1), Point:new(x2, y2))
+end
+
+-- clone refers to a deep copy
+function Rect:clone()
+	return Rect:fromCoods(self.min.x, self.min.y, self.max.x, self.max.y)
+end
+
+-- make sure min and max refer to the correct corners
+-- acts in place, returns self
+function Rect:fix()
+	if self.min.x > self.max.x then
+		self.min.x, self.max.x = self.max.x, self.min.x
+	end
+	if self.min.y > self.max.y then
+		self.min.y, self.max.y = self.max.y, self.min.y
+	end
+end
+
+function Rect:width()
+	return self.max.x - self.min.x
+end
+
+function Rect:height()
+	return self.max.y - self.min.y
+end
+
+function Rect:size()
+	return Point:new(self:width(), self:height())
+end
+
+function Rect:__add(pt)
+	return Rect:fromPoints(self.min + pt, self.max + pt)
+end
+
+function Rect:corners()
+	return {
+		self.min:copy(), -- top left
+		Point:new(self.max.x, self.min.y), -- top right
+		Point:new(self.min.x, self.max.y), -- bottom left
+		self.max:copy(), -- bottom right
+	}
+end
+
+function Rect:containsPoint(pt)
+	return self.min.x < pt.x and
+		self.min.y < pt.y and
+		pt.x < self.max.x and
+		pt.y < self.max.y
+end
+
+function Rect:overlapsRect(other)
+		return self.min.x<other.max.x and self.min.x<other.max.x and
+	       self.min.y<other.max.y and self.min.y<other.max.y
+end
+
+function Rect:draw(style)
+	love.graphics.rectangle(style, self.min.x - Camera.pos.x, self.min.y - Camera.pos.y, self:width(), self:height())
+end
+
+function Rect:__tostring()
+	return "Rect["..tostring(self.min).." "..tostring(self.max).."]"
+end

code/require.lua

@@ -14,6 +14,7 @@ require "code/in_out"
 
 -- classes
 require "code/point"
+require "code/rect"
 require "code/objects"
 require "code/level"
 require "code/camera"

main.lua

@@ -6,9 +6,10 @@ function love.load()
 	secs = 0
 
 	menu_type = "no"
+	-- FIXME: this overrides a standard library!
 	debug = false
 	debug_collision = false
-	editor_mode = false
+	--editor_mode = false
 
 	text_size = 1
 
@@ -103,6 +104,15 @@ function love.update(dt)
 		return
 	end
 
+	if Keybind:checkPressed(Keybind.debug.editor) then
+		if editor.active then
+			deselectSpawns()
+			createTileObjects()
+			restartGame()
+		end
+		editor.active = not editor.active
+	end
+
 	if love.keyboard.isDown("f7") then
 		local test_prompt = Prompt:new({
 			name = "test prompt",
@@ -127,7 +137,7 @@ function love.update(dt)
 	if menu_type ~= nil then stepMenu(menu_type) end
 
 	--editor
-	if editor_mode then
+	if editor.active then
 		stepEditor()
 	else
 		stepGame()
@@ -136,7 +146,7 @@ end
 
 
 function love.wheelmoved(_, y)
-	if editor_mode then
+	if editor.active then
 		scrollEditor(y)
 	end
 end
@@ -150,7 +160,7 @@ function love.draw()
 		game_resize = false
 	end
 
-	if editor_mode then
+	if editor.active then
 		drawEditor()
 	else
 		drawGame()