refactored the whole project into ECS design pattern; Assets is turned into Singleton AssetManager; Quaternion Camera rotation; simple raycasting for destroyng blocks, that is buggy; fix on old comments mistakes; added consts on some functions

Author: vkaytsanov

.gitignore

@@ -194,7 +194,7 @@ PublishScripts/
 # except build/, which is used as an MSBuild target.
 !**/[Pp]ackages/build/
 # Uncomment if necessary however generally it will be regenerated when needed
-#!**/[Pp]ackages/repositories.config
+#!**/[Pp]ackages/repositories.m_config
 # NuGet v3's project.json files produces more ignorable files
 *.nuget.props
 *.nuget.targets
@@ -311,7 +311,7 @@ __pycache__/
 
 # Cake - Uncomment if you are using it
 # tools/**
-# !tools/packages.config
+# !tools/packages.m_config
 
 # Tabs Studio
 *.tss

CMakeLists.txt

@@ -31,6 +31,20 @@ file(GLOB SOURCES
         "src/core/logic/events/include/*.h"
         "src/lib/*.cpp"
         "src/lib/include/*.h"
+        "src/lib/entityx/*.h"
+        "src/lib/entityx/*.cc"
+        "src/lib/entityx/3rdparty/*.hpp"
+        "src/lib/entityx/3rdparty/*.h"
+        "src/lib/entityx/deps/*.h"
+        "src/lib/entityx/help/*.h"
+        "src/lib/entityx/help/*.cc"
+        "src/lib/entityx/tags/*.h"
+        "src/lib/entityx/tags/*.cc"
+        "src/core/systems/*.cpp"
+        "src/core/systems/include/*.h"
+        "src/core/components/*.cpp"
+        "src/core/components/include/*.h"
+        "src/core/events/*.h"
         "src/lib/utils/camera/*.cpp"
         "src/lib/utils/camera/include/*.h"
         "src/lib/utils/geometry/*.cpp"
@@ -51,7 +65,7 @@ file(GLOB SOURCES
 add_executable(${PROJECT_NAME} ${SOURCES})
 
 # in case CMake doesn't find the libraries uncomment the following lines
-# and put your path to the dependencies and add the cmake/sdl2-config.cmake
+# and put your path to the dependencies and add the cmake/sdl2-m_config.cmake
 # file to the root of that directory
 
 list(APPEND CMAKE_PREFIX_PATH "D:/SDL2")

src/core/components/chunk.cpp

@@ -0,0 +1,35 @@
+
+#include "include/chunk.h"
+
+Chunk::Chunk() : m_chunkState(Empty){
+	std::memset(&m_heightMap, 0, sizeof(m_heightMap));
+	m_chunkContents = new std::array<std::array<std::array<Cube, CHUNK_SIZE_X>, CHUNK_SIZE_Y>, CHUNK_SIZE_Z>();
+}
+
+Chunk::~Chunk() {
+	delete m_chunkContents;
+}
+
+void Chunk::setCube(CubeType type, int x, int y, int z) {
+	m_chunkContents->at(x).at(y).at(z).m_type = type;
+}
+
+ChunkContentsPtr Chunk::getChunkContents() const {
+	return m_chunkContents;
+}
+
+HeightMap* Chunk::getHeightMap() {
+	return &m_heightMap;
+}
+
+BiomeMap* Chunk::getBiomeMap() {
+	return &m_biomeMap;
+}
+
+void Chunk::setHeight(int height, int x, int z) {
+	m_heightMap[x][z] = height;
+}
+
+
+
+

src/core/data/terrain/chunk_mesh.cpp src/core/components/chunk_mesh.cpp

@@ -3,11 +3,10 @@
 //
 
 #include "include/chunk_mesh.h"
-#include "include/chunk.h"
-#include "../../../lib/include/lib.h"
+#include "../../lib/include/lib.h"
 
 
-ChunkMesh::ChunkMesh() {
+ChunkMesh::ChunkMesh() : m_chunkMeshState(UnBuilt){
 	static bool indexBufferInitialized = false;
 	static IndexBuffer indexBuffer;
 	if (!indexBufferInitialized) {
@@ -31,30 +30,25 @@ ChunkMesh::ChunkMesh() {
 		delete[] buffer;
 	}
 
-	for (int i = 0; i < vao.size(); i++) {
-		vao.at(i).bind();
-		vbo.at(i).bind();
+	for (int i = 0; i < m_vao.size(); i++) {
+		m_vao.at(i).bind();
+		m_vbo.at(i).bind();
 		indexBuffer.bind();
 
-		vbo.at(i).vertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex),
-		                              (void*) (offsetof(Vertex, position)));
-		vbo.at(i).vertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex),
-		                              (void*) (offsetof(Vertex, uvs)));
-		vbo.at(i).vertexAttribIPointer(2, 1, GL_UNSIGNED_BYTE, sizeof(Vertex),
-		                               (void*) offsetof(Vertex, lightningLevel));
+		m_vbo.at(i).vertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex),
+		                                (void*) (offsetof(Vertex, position)));
+		m_vbo.at(i).vertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(Vertex),
+		                                (void*) (offsetof(Vertex, uvs)));
+		m_vbo.at(i).vertexAttribIPointer(2, 1, GL_UNSIGNED_BYTE, sizeof(Vertex),
+		                                 (void*) offsetof(Vertex, lightningLevel));
 
-		vao.at(i).unbind();
+		m_vao.at(i).unbind();
 	}
 
 }
 
-ChunkMesh::~ChunkMesh() {
-
-}
-
 void ChunkMesh::setMesh(std::array<std::vector<Vertex>, 3>& vertices) {
 	for (int i = 0; i < vertices.size(); i++) {
-		indicesCount.at(i) = 0;
 		std::string type;
 		if(i == 0){
 			type = " normal";
@@ -69,37 +63,40 @@ void ChunkMesh::setMesh(std::array<std::vector<Vertex>, 3>& vertices) {
 		              (std::to_string(vertices.at(i).size()) + type +
 		               " m_vertices").c_str());
 		if (!vertices.at(i).empty()) {
-			vbo.at(i).bind();
-			vbo.at(i).bufferData(vertices.at(i).size() * sizeof(Vertex), &vertices.at(i)[0], GL_STATIC_DRAW);
-			indicesCount.at(i) = std::floor(vertices.at(i).size() / 4) * 6;
+			m_vbo.at(i).bind();
+			m_vbo.at(i).bufferData(vertices.at(i).size() * sizeof(Vertex), &vertices.at(i)[0], GL_STATIC_DRAW);
+			m_indicesCount.at(i) = std::floor(vertices.at(i).size() / 4) * 6;
 			vertices.at(i).clear();
 		}
+		else{
+			m_indicesCount.at(i) = 0;
+		}
 
 	}
 }
 
 VertexArray* ChunkMesh::getVao() {
-	return &vao.at(0);
+	return &m_vao.at(0);
 }
 
 VertexArray* ChunkMesh::getTransparentVao() {
-	return &vao.at(1);
+	return &m_vao.at(1);
 }
 
 VertexArray* ChunkMesh::getModelVao() {
-	return &vao.at(2);
+	return &m_vao.at(2);
 }
 
 unsigned int ChunkMesh::getIndicesCount() {
-	return indicesCount.at(0);
+	return m_indicesCount.at(0);
 }
 
 unsigned int ChunkMesh::getTransparentIndicesCount() {
-	return indicesCount.at(1);
+	return m_indicesCount.at(1);
 }
 
 unsigned int ChunkMesh::getModelIndicesCount() {
-	return indicesCount.at(2);
+	return m_indicesCount.at(2);
 }
 
 

src/core/components/frustum_aabb.cpp

@@ -0,0 +1,37 @@
+//
+// Created by Viktor on 7.3.2021 г..
+//
+
+#include "include/frustum_aabb.h"
+
+FrustumAABB::FrustumAABB(Vector3f dimensions, Vector3f position) : m_dimensions(dimensions), m_position(position) {
+
+}
+
+Vector3f FrustumAABB::getNegativeFarPoint(const Vector3f& normal) {
+	Vector3f result = m_position;
+	if (normal.x < 0) {
+		result.x += m_dimensions.x;
+	}
+	if (normal.y < 0) {
+		result.y += m_dimensions.y;
+	}
+	if (normal.z < 0) {
+		result.z += m_dimensions.z;
+	}
+	return result;
+}
+
+Vector3f FrustumAABB::getPositiveFarPoint(const Vector3f& normal) {
+	Vector3f result = m_position;
+	if (normal.x > 0) {
+		result.x += m_dimensions.x;
+	}
+	if (normal.y > 0) {
+		result.y += m_dimensions.y;
+	}
+	if (normal.z > 0) {
+		result.z += m_dimensions.z;
+	}
+	return result;
+}

src/core/data/terrain/include/chunk.h src/core/components/include/chunk.h

@@ -1,16 +1,17 @@
 //
-// Created by Viktor on 16.2.2021 г..
+// Created by Viktor on 6.3.2021 г..
 //
 
 #ifndef CHUNK_H
 #define CHUNK_H
 
+
 #include <array>
-#include "../../../../lib/utils/geometry/include/vector2.h"
-#include "../../../../lib/utils/camera/include/frustum.h"
+#include "../../data/terrain/include/cube.h"
+#include "../../data/terrain/include/biome.h"
+#include "../../../lib/entityx/entityx.h"
 #include "chunk_mesh.h"
-#include "cube_data_base.h"
-#include "biome.h"
+
 
 typedef std::array<std::array<std::array<Cube, CHUNK_SIZE_X>, CHUNK_SIZE_Y>, CHUNK_SIZE_Z> ChunkContents;
 typedef std::array<std::array<std::array<Cube, CHUNK_SIZE_X>, CHUNK_SIZE_Y>, CHUNK_SIZE_Z>* ChunkContentsPtr;
@@ -22,21 +23,20 @@ enum ChunkState {
 	Empty
 };
 
-class Chunk {
+class Chunk : public entityx::Component<Chunk>{
 private:
-	ChunkContents m_chunkContents;
-	ChunkMesh m_chunkMesh;
-public:
+	ChunkContentsPtr m_chunkContents;
 	HeightMap m_heightMap;
 	BiomeMap m_biomeMap;
+public:
 	ChunkState m_chunkState;
-	ChunkMeshState m_chunkMeshState;
-	FrustumAABB m_frustumAABB;
-	Chunk(int x, int z);
+	Chunk();
 	~Chunk();
 	void setCube(CubeType type, int x, int y, int z);
-	ChunkContentsPtr getChunkContents();
-	ChunkMesh* getChunkMesh();
+	void setHeight(int height, int x, int z);
+	ChunkContentsPtr getChunkContents() const;
+	HeightMap* getHeightMap();
+	BiomeMap* getBiomeMap();
 };
 
 

src/core/data/terrain/include/chunk_mesh.h src/core/components/include/chunk_mesh.h

@@ -1,19 +1,18 @@
 //
-// Created by Viktor on 17.2.2021 г..
+// Created by Viktor on 5.3.2021 г..
 //
 
 #ifndef CHUNK_MESH_H
 #define CHUNK_MESH_H
 
-
-#include <vector>
 #include <array>
-#include "../../../../lib/utils/openGL/include/vertex.h"
-#include "../../../../lib/utils/openGL/include/vertex_array.h"
-#include "../../../../lib/utils/openGL/include/index_buffer.h"
-#include "../../../../lib/utils/openGL/include/vertex_buffer.h"
-#include "cube_data_base.h"
-#include "cube.h"
+#include <vector>
+
+#include "../../../lib/utils/openGL/include/vertex.h"
+#include "../../../lib/utils/openGL/include/vertex_array.h"
+#include "../../../lib/utils/openGL/include/index_buffer.h"
+#include "../../../lib/utils/openGL/include/vertex_buffer.h"
+#include "../../../lib/entityx/entityx.h"
 
 #define CHUNK_SIZE_X 16
 #define CHUNK_SIZE_Y 256
@@ -24,23 +23,21 @@ enum ChunkMeshState {
 	UnBuilt
 };
 
-class ChunkMesh {
+class ChunkMesh : public entityx::Component<ChunkMesh>{
 private:
-	std::array<VertexArray,  3> vao;
-	std::array<VertexBuffer, 3> vbo;
-	std::array<unsigned int, 3> indicesCount;
+	std::array<VertexArray, 3> m_vao;
+	std::array<VertexBuffer, 3> m_vbo;
+	std::array<unsigned int, 3> m_indicesCount;
 public:
 	ChunkMesh();
-	~ChunkMesh();
+	ChunkMeshState m_chunkMeshState;
 	void setMesh(std::array<std::vector<Vertex>, 3>& vertices);
 	VertexArray* getVao();
 	VertexArray* getTransparentVao();
 	VertexArray* getModelVao();
 	unsigned int getIndicesCount();
 	unsigned int getTransparentIndicesCount();
 	unsigned int getModelIndicesCount();
-
-
 };
 
 

src/core/components/include/frustum_aabb.h

@@ -0,0 +1,23 @@
+//
+// Created by Viktor on 7.3.2021 г..
+//
+
+#ifndef FRUSTUM_AABB_H
+#define FRUSTUM_AABB_H
+
+
+#include "transform.h"
+#include "../../../lib/entityx/entityx.h"
+
+class FrustumAABB : public entityx::Component<FrustumAABB>{
+private:
+	Vector3f m_dimensions;
+	Vector3f m_position;
+public:
+	FrustumAABB(Vector3f dimensions, Vector3f position);
+	Vector3f getNegativeFarPoint(const Vector3f& normal);
+	Vector3f getPositiveFarPoint(const Vector3f& normal);
+};
+
+
+#endif //FRUSTUM_AABB_H

src/core/components/include/mesh.h

@@ -0,0 +1,14 @@
+//
+// Created by Viktor on 5.3.2021 г..
+//
+
+#ifndef MESH_H
+#define MESH_H
+
+
+struct Mesh {
+	std::vector<Vertex> vertices;
+};
+
+
+#endif //MESH_H

src/core/components/include/player_controller.h

@@ -0,0 +1,14 @@
+//
+// Created by Viktor on 6.3.2021 г..
+//
+
+#ifndef PLAYER_CONTROLLER_H
+#define PLAYER_CONTROLLER_H
+
+
+class PlayerController {
+
+};
+
+
+#endif //PLAYER_CONTROLLER_H