More element controls, minor refactors

Alpha v0.3

Author: palaceswitcher

CMakeLists.txt

@@ -24,7 +24,7 @@ endif()
 # Find dependencies
 find_package(SDL2_image REQUIRED)
 find_package(SDL2_ttf REQUIRED)
-include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS} ${SDL2_TTF_INCLUDE_DIRS})
+include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS})
 
 # Include source directories and add executable
 include_directories(src/JSON)

changelog.md

@@ -0,0 +1,45 @@
+Information on historical builds from before this was public may be missing or incomplete. These were pretty messy and had little version control.
+
+### Alpha v0.3 (LATEST)
+- Changed font from Droid Sans to Open Sans.
+- Element code has been refactored slightly.
+- Right clicking an element now deletes it.
+- Double clicking an element now duplicates it relative to the corner it was clicked on.
+
+### Alpha v0.2
+- ImGui has been added and has yet to be used.
+- Disabled VSync.
+- Removed unused element code.
+
+### Alpha v0.1.2
+- Re-enabled VSync.
+
+### Alpha v0.1.1
+- Changed font from Roboto to Droid Sans.
+- Fixed animation code.
+- Changed asset folders.
+- Disabled VSync.
+
+### Alpha v0.1
+- Windows is now supported.
+- Added FPS counter.
+- Elements are no longer Z-sorted unless needed.
+- VSync temporarily re-enabled.
+
+### Pre-alpha v0.2
+- Elements now have text below them.
+- Z-indexing now works properly?
+- Minor fixes and refactoring.
+
+### Pre-alpha v0.1
+- Added version text in the top left corner.
+- Added animations?
+- Disabled VSync.
+
+### xreation test 2
+- Various fixes.
+- Elements can now be spawned by double clicking?
+
+### xreation test 1
+- Initial version?
+- Fire and air are spawned by default. There are no means of spawning more elements.

src/GFX/Animation.hpp

@@ -1,5 +1,4 @@
 #include <SDL2/SDL.h>
-#include <stdlib.h>
 #include <stdbool.h>
 #include "SDL_FontCache.h"
 #include "../Game/Sprite.hpp"

src/GFX/SDL_FontCache.h

@@ -33,8 +33,8 @@ THE SOFTWARE.
 #ifndef _SDL_FONTCACHE_H__
 #define _SDL_FONTCACHE_H__
 
-#include "SDL.h"
-#include "SDL_ttf.h"
+#include <SDL2/SDL.h>
+#include <SDL2/SDL_ttf.h>
 
 #ifdef FC_USE_SDL_GPU
     #include "SDL_gpu.h"

src/Game/Element.cpp

@@ -7,7 +7,6 @@
 #include <unordered_map>
 #include <algorithm>
 #include <memory>
-#include <cmath>
 #include "Element.hpp"
 #include "Sprite.hpp"
 #include "../GFX/Animation.hpp"
@@ -16,8 +15,6 @@
 #include "../Misc/IO.hpp"
 #include "../Menu/Lang.hpp"
 
-bool compareZIndexRaw(DraggableElement* d1, DraggableElement* d2) { return d1->z > d2->z; } //Z-index comparison for raw pointers
-
 // Constructor
 DraggableElement::DraggableElement(std::string elemID, int mX, int mY) {
 	SDL_Rect* newElemBox = (SDL_Rect*) malloc(sizeof(struct SDL_Rect)); //Allocate space for new element's rectangle
@@ -44,7 +41,6 @@ DraggableElement::~DraggableElement() {
 
 // Checks if two elements are colliding and combines them if possible
 void DraggableElement::makeCombo(std::vector<std::unique_ptr<DraggableElement>> &draggables, std::vector<std::string> &elementsUnlocked) {
-	elem::firstParentElem = this;
 	// Place newly unlocked elements on screen
 	DraggableElement* matchingElem;
 	bool comboMade = false; //This indicates if a valid combination was made and allows the function to unlock that element
@@ -62,7 +58,12 @@ void DraggableElement::makeCombo(std::vector<std::unique_ptr<DraggableElement>>
 		}
 	}
 	if (!collidedElements.empty()) {
-		std::stable_sort(collidedElements.begin(), collidedElements.end(), compareZIndexRaw);
+		std::stable_sort(collidedElements.begin(), collidedElements.end(), [this]
+		(DraggableElement* d1, DraggableElement* d2) {
+			SDL_Rect* d1Intersect; SDL_IntersectRect(this->box, d1->box, d1Intersect);
+			SDL_Rect* d2Intersect; SDL_IntersectRect(this->box, d2->box, d2Intersect); //The intersecting rectangles between the combined elements. The combination with the largest intersection area will be the combined element
+			return d1->z > d2->z && (d1Intersect->x * d1Intersect->y) > (d2Intersect->x * d2Intersect->y);
+		});
 		matchingElem = collidedElements.back(); //Match with the element with the lowest Z-index
 		elem::secondParentElem = collidedElements.back(); //Match with the element with the lowest Z-index
 	}
@@ -97,7 +98,7 @@ void DraggableElement::makeCombo(std::vector<std::unique_ptr<DraggableElement>>
 		}
 
 		// Queue combined elements to start despawning
-		elem::firstParentElem->anim = ANIM_SHRINK;
+		this->anim = ANIM_SHRINK;
 		elem::secondParentElem->anim = ANIM_SHRINK;
 		anim::animInProgress = true; //Start animations
 	}
@@ -111,7 +112,6 @@ void DraggableElement::deleteElem(std::vector<std::unique_ptr<DraggableElement>>
 
 namespace elem {
 	std::unordered_map<std::string, SDL_Texture*> textureIndex;
-	DraggableElement* firstParentElem;
 	DraggableElement* secondParentElem; //First and second selected elements
 	cJSON* root = NULL; //Root of combination JSON data
 

src/Game/Element.hpp

@@ -1,4 +1,3 @@
-#include <stdlib.h>
 #include <stdbool.h>
 #include <vector>
 #include <string>
@@ -27,12 +26,9 @@ class DraggableElement : public Sprite {
 	static void deleteElem(std::vector<std::unique_ptr<DraggableElement>> &draggables, DraggableElement* elem);
 };
 
-bool compareZIndexRaw(DraggableElement* d1, DraggableElement* d2);
-
 namespace elem {
 	extern std::unordered_map<std::string, SDL_Texture*> textureIndex;
 	extern cJSON* root; //Root of combination JSON data
-	extern DraggableElement* firstParentElem;
 	extern DraggableElement* secondParentElem; //First and second selected elements
 	void loadTexture(SDL_Renderer* ren, DraggableElement* elem);
 	void spawnDraggable(std::vector<std::unique_ptr<DraggableElement>> &draggables, int x, int y, std::string name);

src/Game/Sprite.hpp

@@ -1,7 +1,5 @@
 #include <SDL2/SDL.h>
 #include <SDL2/SDL_image.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <stdbool.h>
 #include <vector>
 #ifndef SPRITE_HPP_ //Include guard

src/main.cpp

@@ -34,7 +34,7 @@ int main(int argc, char* argv[])
 		return EXIT_FAILURE;
 	}
 	// Initialize window
-	SDL_Window* win = SDL_CreateWindow("Alchemy++ alpha v0.2", 64, 64, 800, 600, SDL_WINDOW_SHOWN|SDL_WINDOW_RESIZABLE);
+	SDL_Window* win = SDL_CreateWindow("Alchemy++ alpha v0.3", 64, 64, 800, 600, SDL_WINDOW_SHOWN|SDL_WINDOW_RESIZABLE);
 	if (win == NULL) {
 		fprintf(stderr, "SDL_CreateWindow Error: %s\n", SDL_GetError());
 		return EXIT_FAILURE;
@@ -79,8 +79,6 @@ int main(int argc, char* argv[])
 	FC_Font* font = FC_CreateFont();
 	FC_LoadFont(font, ren, "gamedata/default/font/Open-Sans.ttf", 12, FC_MakeColor(255,255,255,255), TTF_STYLE_NORMAL);
 
-	//FC_LoadFontFromTTF(font, ren, ttfFont, FC_MakeColor(255,255,255,255));
-
 	elem::JSONInit(); //Initialize JSON
 	Text::loadAll("en-us"); //Load game text
 
@@ -103,14 +101,14 @@ int main(int argc, char* argv[])
 
 	auto endTick = Clock::now();
 	double deltaTime = 1.0/60;
+	// Game flags
+	bool deleteNeeded = false; //Used to determine if any elements need to be deleted
 	bool zSortNeeded = false; //Used to indicate if elements need to be sorted
 	bool quit = false; //Main loop exit flag
 	while (!quit) {
 		SDL_GetWindowSize(win, &winWidth, &winHeight); //Get screen size
 		auto startTick = Clock::now();
 
-		//deltaTime = endTick-startTick;
-
 		SDL_Event e;
 		ImGui_ImplSDL2_ProcessEvent(&e);
 		while (SDL_PollEvent(&e)) {
@@ -136,40 +134,58 @@ int main(int argc, char* argv[])
 						selectedElem = NULL; //Release selected rectangle when left is released
 						zSortNeeded = true; //Re-sort Z-index after element was dropped
 					}
+					// Remove if right clicked
 					if (rightClickDown && e.button.button == SDL_BUTTON_RIGHT) {
 						rightClickDown = false;
+						if (selectedElem != NULL) {
+							selectedElem->anim = ANIM_SHRINK;
+							anim::animInProgress = true;
+							selectedElem = nullptr;
+						}
 					}
 					break;
 				case SDL_MOUSEBUTTONDOWN:
+					// Get element clicked regardless of mouse button
+					std::vector<DraggableElement*> clickMatches; //Every element that the cursor clicked on
+					if (selectedElem == NULL) {
+						for (auto &d : draggables) {
+							if (SDL_PointInRect(&mousePos, d->box)) {
+								clickMatches.push_back(d.get());
+							}
+						}
+						if (!clickMatches.empty()) {
+							zSortNeeded = true; //Z-index will need to be resorted as this element will be moved to the front
+							std::stable_sort(clickMatches.begin(), clickMatches.end(), [](DraggableElement* d1, DraggableElement* d2) {
+								return d1->z > d2->z;
+							});
+
+							selectedElem = clickMatches.back(); //Select rectangle with highest Z-index
+							selectedElem->z = 0; //Move to front of z-index
+						}
+					}
 					if (!leftClickDown && e.button.button == SDL_BUTTON_LEFT) {
 						leftClickDown = true;
-
-						std::vector<DraggableElement*> clickMatches; //Every element that the mouse clicked on
 						if (selectedElem == NULL) {
-							for (auto &d : draggables) {
-								if (SDL_PointInRect(&mousePos, d->box)) {
-									clickMatches.push_back(d.get());
-								}
-							}
 							if (!clickMatches.empty()) {
-								zSortNeeded = true; //Z-index will need to be resorted as this element will be moved to the front
-								std::stable_sort(clickMatches.begin(), clickMatches.end(), compareZIndexRaw); //Sort matching elements by Z-index, with the highest coming last
-
-								selectedElem = clickMatches.back(); //Select rectangle with highest Z-index
-								selectedElem->z = 0; //Move to front of z-index
 								clickOffset.x = mousePos.x - selectedElem->box->x;
 								clickOffset.y = mousePos.y - selectedElem->box->y; //Get clicked point in element box relative to its boundary
 							}
 						} else {
 							clickOffset.x = mousePos.x - selectedElem->box->x;
 							clickOffset.y = mousePos.y - selectedElem->box->y; //Don't look for a new element to select if one is already selected
 						}
-						//Spawn new elements on double click
-						if (SDL_GetTicks64() > leftClickTick && SDL_GetTicks64() <= leftClickTick + 250) { //Double clicks have to be within 3/8 second of each other
-							elem::spawnDraggable(draggables, mousePos.x, mousePos.y+32, "air");
-							elem::spawnDraggable(draggables, mousePos.x, mousePos.y-32, "earth");
-							elem::spawnDraggable(draggables, mousePos.x-32, mousePos.y, "fire");
-							elem::spawnDraggable(draggables, mousePos.x+32, mousePos.y, "water");
+						// Spawn new elements on double click
+						if (SDL_GetTicks64() > leftClickTick && SDL_GetTicks64() <= leftClickTick + 250) { //Double clicks have to be within 1/4 second of each other
+							if (selectedElem == NULL) {
+								elem::spawnDraggable(draggables, mousePos.x, mousePos.y+40, "air");
+								elem::spawnDraggable(draggables, mousePos.x, mousePos.y-40, "earth");
+								elem::spawnDraggable(draggables, mousePos.x-40, mousePos.y, "fire");
+								elem::spawnDraggable(draggables, mousePos.x+40, mousePos.y, "water");
+							} else {
+								int hSpawnOffset = ((selectedElem->box->x + selectedElem->box->w/2) > mousePos.x) ? -40 : 40;
+								int vSpawnOffset = ((selectedElem->box->y + selectedElem->box->h/2) > mousePos.y) ? -40 : 40; //Duplocate the element to the corner it was clicked
+								elem::spawnDraggable(draggables, selectedElem->box->x+hSpawnOffset, selectedElem->box->y+vSpawnOffset, selectedElem->id); //Duplicate element if it's double clicked
+							}
 						}
 						leftClickTick = SDL_GetTicks64(); //Get next click tick
 					}
@@ -182,7 +198,8 @@ int main(int argc, char* argv[])
 		}
 		// Sort draggable elements by z index when animations finish
 		if (zSortNeeded && !anim::animInProgress) {
-			std::stable_sort(draggables.begin(), draggables.end(), [](const std::unique_ptr<DraggableElement> &d1, const std::unique_ptr<DraggableElement> &d2) {
+			std::stable_sort(draggables.begin(), draggables.end(), []
+			(const std::unique_ptr<DraggableElement> &d1, const std::unique_ptr<DraggableElement> &d2) {
 				return d1->z > d2->z;
 			});
 			zSortNeeded = false;
@@ -194,21 +211,23 @@ int main(int argc, char* argv[])
 				if (d->anim == ANIM_SHRINK) {
 					anim::animateShrink(d.get(), deltaTime);
 					animDone = true;
+				} else if (d->anim == ANIM_SHRINK_END) {
+					d->queuedForDeletion = true; //Queue element for deletion when it finishes shrinking
+					deleteNeeded = true; //Remove elements when they finish shrinking
+					animDone = true;
 				} else if (d->anim == ANIM_GROW) {
 					anim::animateGrow(d.get(), deltaTime);
 					animDone = true;
 				}
 				anim::animInProgress = animDone; //Stop animations if none are running
 			}
-			// Remove combined elements when they finish shrinking
-			if (elem::firstParentElem != NULL && elem::secondParentElem != NULL && elem::firstParentElem->anim == ANIM_SHRINK_END && elem::secondParentElem->anim == ANIM_SHRINK_END) {
-				//elem::firstParentElem->queuedForDeletion = true;
-				//elem::secondParentElem->queuedForDeletion = true;
-				DraggableElement::deleteElem(draggables, elem::firstParentElem);
-				DraggableElement::deleteElem(draggables, elem::secondParentElem); //Delete combo elements when they finish shrinking
-				elem::firstParentElem = NULL;
-				elem::secondParentElem = NULL;
-			}
+		}
+		// Remove elements that are queued for deletion if needed
+		if (deleteNeeded) {
+			draggables.erase(std::remove_if(draggables.begin(), draggables.end(), []
+			(const std::unique_ptr<DraggableElement> &d) { return d->queuedForDeletion; }
+			), draggables.end());
+			deleteNeeded = false;
 		}
 
 		// Load draggable element textures
@@ -227,7 +246,7 @@ int main(int argc, char* argv[])
 		SDL_RenderCopy(ren, addBtn, NULL, &r); //Render add button
 
 		//Render text
-		FC_Draw(font, ren, 0, 0, "Alchemy++ alpha v0.2");
+		FC_Draw(font, ren, 0, 0, "Alchemy++ alpha v0.3");
 
 		FC_Draw(font, ren, 20, winHeight-20, "elems: %d", draggables.size());