Select pieces from the bar and add them to the level

src/Editor/bar.cpp

@@ -94,6 +94,17 @@ void Bar::changeType(int t)
 	resizeBarScrollRect(window_ptr->width, window_ptr->height);
 }
 
+int Bar::getPieceIDByScreenPos(int mousePos)
+{
+	int piece = mousePos + barScrollX - BAR_HEIGHT;
+	piece /= PIECESIZE;
+
+	if (piece > style_ptr->object[type].size())
+		return -1;
+	int id = style_ptr->object[type][piece].id;
+	return id;
+}
+
 void Bar::draw( void )
 {
 	{ // bar background in the absense of a proper graphic

src/Editor/bar.hpp

@@ -58,6 +58,8 @@ class Bar
 
 	void changeType( int t);
 
+	int getPieceIDByScreenPos ( int mousePos );
+
 	void draw( void );
 
 	Bar(void) { /* nothing to do */ };

src/Editor/canvas.cpp

@@ -19,7 +19,7 @@
 */
 
 /*
-This file includes code to manage drawing in the editor, and the properties fo the part of the screen
+This file includes code to manage drawing in the editor, and the properties of the part of the screen
 where the level is displayed
 */
 
@@ -114,7 +114,7 @@ void Canvas::draw()
 
 	SDL_SetRenderTarget(window_ptr->screen_renderer, NULL);
 	SDL_RenderCopy(window_ptr->screen_renderer, window_ptr->screen_texture, NULL, NULL);
-	SDL_RenderPresent(window_ptr->screen_renderer);
+
 
 
 }
@@ -134,6 +134,25 @@ void Canvas::draw_selection_box(int x, int y, int width, int height)
 	SDL_RenderDrawRect(window_ptr->screen_renderer, &r);
 }
 
+void Canvas::drawHeldObject(int holdingType, int holdingID, int x, int y)
+{
+	int scrollOffsetX, scrollOffsetY, drawX, drawY;
+	if (y < height)
+	{
+		scrollOffsetX = (scroll_x % 8) * zoom;
+		scrollOffsetY = (scroll_y % 2) * zoom;
+		drawX = x - ((x + scrollOffsetX) % (8 * zoom));
+		drawY = y - ((y + scrollOffsetY) % (2 * zoom));
+	}
+	else
+	{
+		drawX = x;
+		drawY = y;
+	}
+	int drawID = style_ptr->object_by_id(holdingType, holdingID);
+	style_ptr->draw_object_texture(window_ptr, drawX, drawY, holdingType, drawID, zoom, NULL);
+}
+
 void Canvas::draw_dashed_level_border(borderType type, int pos, int offset)
 {
 	//We have an offset so the lines don't scroll out of synch with the view when scrolling
@@ -155,7 +174,7 @@ void Canvas::draw_dashed_level_border(borderType type, int pos, int offset)
 	}
 	if (type == vertical)
 	{
-		end = window_ptr->height;
+		end = height;
 		x1 = pos;
 		x2 = pos;
 		y1 = 0 - initialOffset;

src/Editor/canvas.hpp

@@ -56,6 +56,8 @@ class Canvas
 
 	void draw_selection_box(int x, int y, int width, int height);
 
+	void drawHeldObject(int holdingType, int holdingID, int x, int y);
+
 	enum borderType { horizontal, vertical };
 	void draw_dashed_level_border(borderType type, int pos, int offset);
 

src/Editor/editor.cpp

@@ -130,7 +130,7 @@ bool Editor::paste( void )
 	selection.clear(); // maybe delete selection instead?
 
 	for (Clipboard::const_iterator i = clipboard.begin(); i != clipboard.end(); ++i)
-	{
+	{		
 		const Level::Object::Index &index = i->first;
 
 		level.object[index.type].push_back(i->second);
@@ -141,6 +141,18 @@ bool Editor::paste( void )
 	return canvas.redraw = !clipboard.empty();
 }
 
+bool Editor::addObject(int idToAdd, int typeToAdd, int xToAdd, int yToAdd)
+{
+	Level::Object o;
+
+	o.id = idToAdd;
+	o.x = xToAdd;
+	o.y = yToAdd;
+	level.object[typeToAdd].push_back(o);
+
+	return canvas.redraw = true;
+}
+
 bool Editor::decrease_obj_id( void )
 {
 	for (Selection::const_iterator i = selection.begin(); i != selection.end(); ++i)

src/Editor/editor.hpp

@@ -60,6 +60,8 @@ class Editor
 	bool select_none( void );
 	bool select_all( void );
 
+	bool addObject(int idToAdd, int typeToAdd, int xToAdd, int yToAdd);
+
 	bool copy_selected( void );
 	bool paste( void );
 	bool decrease_obj_id(void);

src/Editor/input.cpp

@@ -48,6 +48,8 @@ void Editor_input::load(void)
 	dragging = false;
 	leftScrollButtonHolding = false;
 	rightScrollButtonHolding = false;
+	holdingID = -1;
+	holdingType = -1;
 }
 
 void Editor_input::handleEvents(SDL_Event event)
@@ -99,24 +101,48 @@ void Editor_input::handleEvents(SDL_Event event)
 		{
 			canvas_ptr->mouse_remainder_x = 0;
 			canvas_ptr->mouse_remainder_y = 0;
-		}
-
-		if (e.button == SDL_BUTTON_LEFT || e.button == SDL_BUTTON_RIGHT)
-		{
 			if (mouse_y_window < canvas_ptr->height)
 				// canvas
 			{
-				editor_ptr->select(mouse_x, mouse_y, ctrl_down);
+				if (holdingType != -1 && holdingID != -1)
+				{
+					editor_ptr->addObject(holdingID, holdingType, mouse_x - (mouse_x % 8), mouse_y - (mouse_y % 2));
+
+					Level::Object::Index o(holdingType, level_ptr->object[holdingType].size() - 1);
+					editor_ptr->selection.insert(o);
+
+					holdingType = -1;
+					holdingID = -1;
+				}
+				else
+				{
+					editor_ptr->select(mouse_x, mouse_y, ctrl_down);
+				}
 			}
 			else if (mouse_x_window < BAR_HEIGHT)
 				// options panel
 			{
-
+				holdingType = -1;
+				holdingID = -1;
 			}
 			else if (mouse_y_window < window_ptr->height - 16)
 				// piece browser
 			{
-
+				if (holdingType == -1 && holdingID == -1)
+				{
+					int pieceSelected = bar_ptr->getPieceIDByScreenPos(mouse_x_window);
+					if (pieceSelected != -1)
+					{
+						holdingType = bar_ptr->type;
+						holdingID = pieceSelected;
+						editor_ptr->select_none();
+					}
+				}
+				else
+				{
+					holdingType = -1;
+					holdingID = -1;
+				}
 			}
 			else if (mouse_x_window < BAR_HEIGHT + 16)
 				// piece browser scroll bar left button
@@ -289,6 +315,10 @@ void Editor_input::handleEvents(SDL_Event event)
 		}
 
 		canvas_ptr->draw();
+		if (holdingType != -1 && holdingID != -1)
+			canvas_ptr->drawHeldObject(holdingType, holdingID, mouse_x_window, mouse_y_window);
+
+		SDL_RenderPresent(window_ptr->screen_renderer);
 
 		break;
 	}

src/Editor/input.hpp

@@ -46,6 +46,8 @@ class Editor_input
 	Sint32 mouse_prev_x, mouse_prev_y;
 	bool dragging, leftScrollButtonHolding, rightScrollButtonHolding;
 
+	int holdingID, holdingType;
+
 	void setReferences(Window * w, Editor * e, Bar * b, Canvas * c, Style * s, Level * l);
 	void load(void);