Resources (#8)

* smoother building drag

* almost fixed rhombus collision detection

* screen lerps back to bounds when panned too far

* timer for wheat

* wheat

* resource collection

* reworked event handling

* updates resource bar when resource collected

Author: alexapostolu

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10)
 project(kingdoms)
 
-set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/out/build")
 
 # Add the include directory

README.md

@@ -50,4 +50,9 @@ There's this upcoming third person Steam game called [Kingmakers](https://store.
 
 ### Technical Information
 
-Made using C++ 17, [SDL 2.30.3](https://github.com/libsdl-org/SDL/releases/tag/release-2.30.3), [SDL_ttf 2.22.0](https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.22.0), and [SDL_image 2.8.2](https://github.com/libsdl-org/SDL_image/releases/tag/release-2.8.2). Models made using Blender. Developed on Visual Studio using CMake.
+`C++20`, `CMake`, `Visual Studio`
+[SDL 2.30.3](https://github.com/libsdl-org/SDL/releases/tag/release-2.30.3)
+[SDL_ttf 2.22.0](https://github.com/libsdl-org/SDL_ttf/releases/tag/release-2.22.0)
+[SDL_image 2.8.2](https://github.com/libsdl-org/SDL_image/releases/tag/release-2.8.2)
+[SDL_FontCache](https://github.com/grimfang4/SDL_FontCache)
+Models made with `Blender`

assets/Cinzel.ttf

@@ -0,0 +1,92 @@
+#pragma once
+
+#include "object.hpp"
+#include "grid.hpp"
+
+#include "SDL.h"
+
+#include <forward_list>
+#include <array>
+#include <optional>
+
+namespace king {
+
+class Farmhouse : private Object
+{
+public:
+	/*
+	 * @param renderer To create the farmhouse texture
+	 * @param pos The inital position used to calculate the grid snap
+	 *   position
+	 */
+	Farmhouse(
+		SDL_Renderer* renderer,
+		SDL_FPoint const& pos,
+		Grid const& grid,
+		float _scale
+	);
+
+	void init_resource_timer();
+
+	~Farmhouse();
+
+public:
+	void pan(float dx, float dy);
+
+	/*
+	 * @returns True if mouse is pressed over the object
+	 */
+	bool mouse_press(float mx, float my);
+	int mouse_press_update();
+
+	/*
+	 * @param farmhouses For collision detection
+	 */
+	void mouse_drag(float mx, float my, std::forward_list<Farmhouse> const& farmhouses, float scale);
+	
+	void mouse_release();
+
+	/*
+	 * Zoom based on mouse position and scale
+	 */
+	void mouse_wheel(int mouse_x, int mouse_y, float scale_ratio);
+
+	void render(SDL_Renderer* renderer, float scale);
+
+	void update();
+
+	static Uint32 resource_callback(Uint32 interval, void* obj);
+
+private:
+	bool is_rhombus_in_rhombus(std::array<SDL_Vertex, 4> const& _vertices) const;
+
+public:
+	inline static Farmhouse* drag_ptr = nullptr;
+
+public:
+	// Display
+	SDL_Texture* texture;
+	int texture_width, texture_height;
+	SDL_Colour clr;
+
+	// Position
+	float offset_x, offset_y;
+	std::array<SDL_Vertex, 4> grid_snap_vertices;
+	std::array<SDL_Vertex, 4> absolute_vertices;
+
+	// Movement
+	float start_mouse_drag_x, start_mouse_drag_y;
+	// If the movement ends at an invalid location, reset the position to original
+	bool record_start_vertices;
+	std::array<SDL_Vertex, 4> start_grid_snap_vertices;
+	std::array<SDL_Vertex, 4> start_absolute_vertices;
+
+	// Resourse Generation
+	SDL_Texture* resource_texture;
+	int resource_texture_width, resource_texture_height;
+	bool display_resource;
+	float resource_amount;
+	float resource_per_sec;
+};
+
+} // namespace king

assets/static/Cinzel-Black.ttf

@@ -0,0 +1,25 @@
+#pragma once
+
+#include "object.hpp"
+
+#include "SDL.h"
+
+namespace king {
+
+class Grid : private Object
+{
+public:
+	Grid(int _width, int _height);
+	~Grid();
+
+public:
+	void mouse_wheel(int mouse_x, int mouse_y, float scale_ratio);
+	void mouse_drag(float dx, float dy);
+	void render(SDL_Renderer* renderer, float scale);
+
+public:
+	int width, height;
+	SDL_FPoint** data;
+};
+
+}

assets/static/Cinzel-Bold.ttf

@@ -2,59 +2,24 @@
 
 #include "SDL.h"
 
-#include <array>
-#include <vector>
-#include <forward_list>
-
 namespace king {
 
-struct Object
+/*
+ * The standard action of an Object is to handle house presses (eg. resource collection),
+ * mouse drag (eg. drag and rellocate) and mouse release (clear grid background).
+ * It should also provide a pointer that points to the active object in the
+ * collection. This should be set by the caller to know which object to drag
+ * when mouse is pressed and dragged.
+ * Note that mouse drag should only be applied to the active object, not the
+ * entire collection.
+ * 
+ * mx, my - mouse x and y position
+ * dx, dy - delta/change in x and y position
+ */
+class Object
 {
 protected:
 	void pan_point(SDL_FPoint& point, float dx, float dy);
 };
 
-class Farmhouse : private Object
-{
-public:
-	Farmhouse(SDL_Renderer* renderer, std::array<SDL_Vertex, 4> const& _grid_snap_vertices);
-	~Farmhouse();
-
-public:
-	void pan(float dx, float dy);
-	/*
-	 * @returns True if mouse is pressed over the object
-	 */
-	bool mouse_pressed(float mx, float my);
-	void drag(float mx, float my, std::forward_list<Farmhouse> const& farmhouses);
-	void mouse_released();
-	void zoom(SDL_MouseWheelEvent const& wheel);
-	void render(SDL_Renderer* renderer);
-
-	bool isPointInObject(int px, int py) const;
-	bool isPolygonInObject(std::array<SDL_Vertex, 4> const& _vertices) const;
-
-public:
-	inline static Farmhouse* drag_ptr = nullptr;
-
-public:
-	// Display
-	SDL_Texture* texture;
-	int texture_width, texture_height;
-	SDL_Colour clr;
-
-	// Position
-	std::array<SDL_Vertex, 4> grid_snap_vertices;
-	std::array<SDL_Vertex, 4> absolute_vertices;
-
-	// Movement
-	float start_mouse_drag_x, start_mouse_drag_y;
-	// If the movement ends at an invalid location, reset the position to original
-	std::array<SDL_Vertex, 4> start_grid_snap_vertices;
-	std::array<SDL_Vertex, 4> start_absolute_vertices;
-
-	// Scaling
-	float old_scale;
-};
-
 } // namespace king

assets/static/Cinzel-ExtraBold.ttf

@@ -1,4 +1,4 @@
-add_executable(kingdoms main.cpp object.cpp ${SDL_fontcache_DIR}/SDL_FontCache.c)
+add_executable(kingdoms main.cpp object.cpp farmhouse.cpp grid.cpp ${SDL_fontcache_DIR}/SDL_FontCache.c)
 
 # Specify the SDL2 and SDL2_ttf library directories
 target_link_libraries(kingdoms