Entities

.gitignore

@@ -53,6 +53,7 @@ doc/html
 doc/latex
 
 # Binaries
+build
 openminer
 openminer_server
 *.exe
@@ -63,5 +64,6 @@ openminer_server
 *.zip
 test_atlas.png
 config.lua
+server_config.lua
 TODO
 

.gitmodules

@@ -0,0 +1,11 @@
+[submodule "external/entt"]
+	path = external/entt
+	url = git://github.com/skypjack/entt.git
+	ignore = dirty
+[submodule "external/SFML"]
+	path = external/SFML
+	url = git://github.com/SFML/SFML.git
+	ignore = dirty
+[submodule "external/gamekit"]
+	path = external/gamekit
+	url = git://github.com/Unarelith/GameKit.git

.travis.yml

@@ -1,5 +1,5 @@
 os: linux
-dist: trusty
+dist: xenial
 language: cpp
 
 compiler:
@@ -32,21 +32,11 @@ addons:
 
 before_install:
   - sudo cp /usr/include/lua5.2/* /usr/include/
-  - git clone git://github.com/SFML/SFML.git
-  - cd SFML
-  - cmake .
-  - make -j8
-  - sudo make install
-  - cd ..
-  - git clone git://github.com/Quent42340/GameKit.git
-  - cd GameKit
-  - cmake .
-  - make -j8
-  - sudo make install
-  - cd ..
 
 script:
-  - cmake .
+  - mkdir build
+  - cd build
+  - cmake ..
   - make -j8
 
 notifications:

CMakeLists.txt

@@ -15,14 +15,16 @@ endif ()
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
+include_directories(external)
+
 #------------------------------------------------------------------------------
 # Compiler flags
 #------------------------------------------------------------------------------
 set(DEBUG_GCC_FLAGS -g -Og -Wall -Wextra -Wfatal-errors -Wno-variadic-macros)
 set(RELEASE_GCC_FLAGS -O3)
 set(RELWITHDEB_GCC_FLAGS -g -O3 -Wall -Wextra -Wfatal-errors -Wno-variadic-macros)
 
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 
 #------------------------------------------------------------------------------
 # Setting default build type
@@ -55,21 +57,6 @@ endif()
 include_directories(${LUA_INCLUDE_DIR})
 link_directories(${LUA_LIBRARY_DIRS})
 
-#------------------------------------------------------------------------------
-# - gamekit
-#------------------------------------------------------------------------------
-if (WIN32)
-	set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${WIN_LIBRARIES_PATH}/gamekit)
-endif ()
-
-find_package(GameKit REQUIRED)
-
-if(NOT GAMEKIT_FOUND)
-	message(FATAL_ERROR "gamekit is needed to build the project. Please install it correctly.")
-endif()
-
-include_directories(${GAMEKIT_INCLUDE_DIR})
-
 #------------------------------------------------------------------------------
 # - tinyxml2
 #------------------------------------------------------------------------------
@@ -149,38 +136,66 @@ include_directories(${SDL2_INCLUDE_DIRS}
                     ${SDL2_TTF_INCLUDE_DIRS})
 
 #------------------------------------------------------------------------------
-# - SFML network
+# - GLEW
 #------------------------------------------------------------------------------
 if (WIN32)
-	set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${WIN_LIBRARIES_PATH}/SFML)
-endif ()
+	set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${WIN_LIBRARIES_PATH}/glew)
+
+	find_package(GLEW REQUIRED)
+
+	if(NOT GLEW_FOUND)
+		message(FATAL_ERROR "GLEW not found!")
+	endif(NOT GLEW_FOUND)
 
-if (MINGW)
-	set(SFML_STATIC_LIBRARIES TRUE)
+	include_directories(${GLEW_INCLUDE_DIRS})
 endif ()
 
-find_package(SFML COMPONENTS system network)
+#------------------------------------------------------------------------------
+# Submodules
+# from https://cliutils.gitlab.io/modern-cmake/chapters/projects/submodule.html
+#------------------------------------------------------------------------------
+find_package(Git QUIET)
 
-if(NOT SFML_FOUND)
-	message(FATAL_ERROR "SFML is needed to build the project. Please install it correctly.")
+if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
+	option(GIT_SUBMODULE "Check submodules during build" ON)
+	if(GIT_SUBMODULE)
+		message(STATUS "Submodule update")
+		execute_process(COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
+			WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+			RESULT_VARIABLE GIT_SUBMOD_RESULT)
+		if(NOT GIT_SUBMOD_RESULT EQUAL "0")
+			message(FATAL_ERROR "git submodule update --init failed with ${GIT_SUBMOD_RESULT}, please checkout submodules")
+		endif()
+	endif()
 endif()
 
-include_directories(${SFML_INCLUDE_DIRS})
+if(NOT EXISTS "${PROJECT_SOURCE_DIR}/external/gamekit/CMakeLists.txt")
+    message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.")
+endif()
 
 #------------------------------------------------------------------------------
-# - GLEW
+# - EnTT
 #------------------------------------------------------------------------------
-if (WIN32)
-	set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${WIN_LIBRARIES_PATH}/glew)
+add_subdirectory(external/entt)
+include_directories(external/entt/single_include)
 
-	find_package(GLEW REQUIRED)
+#------------------------------------------------------------------------------
+# - gamekit
+#------------------------------------------------------------------------------
+add_subdirectory(external/gamekit)
+include_directories(external/gamekit/include)
 
-	if(NOT GLEW_FOUND)
-		message(FATAL_ERROR "GLEW not found!")
-	endif(NOT GLEW_FOUND)
+#------------------------------------------------------------------------------
+# - SFML network
+#------------------------------------------------------------------------------
+set(SFML_BUILD_AUDIO FALSE)
+set(SFML_BUILD_GRAPHICS FALSE)
+set(SFML_BUILD_WINDOW FALSE)
+set(SFML_STATIC TRUE)
 
-	include_directories(${GLEW_INCLUDE_DIRS})
-endif ()
+set(BUILD_SHARED_LIBS OFF)
+
+add_subdirectory(external/SFML)
 
 #------------------------------------------------------------------------------
 # Subdirectories

README.md

@@ -11,6 +11,9 @@
 - [Wiki](#wiki)
 - [Keys](#keys)
 - [How to compile](#how-to-compile)
+    - [Using Linux](#using-linux)
+    - [Using Windows](#using-windows)
+    - [Using OSX](#using-osx)
 - [Discussion](#discussion)
 - [Project status](#project-status)
 - [Screenshots](#screenshots)
@@ -63,22 +66,25 @@ The long-term goal of this project is to provide a viable alternative to Minecra
 ### Using Linux
 
 - Dependencies:
-    - A compiler with C++14 support (GCC >= 5.0 or clang >= 3.4)
-    - [CMake](http://www.cmake.org/download/)
-    - [GameKit](https://github.com/Unarelith/GameKit) (requires `SDL2` + `tinyxml2`, will switch to `SFML` starting from 2.6)
-    - [SFML](https://www.sfml-dev.org/) (only used for network)
+    - A compiler with C++17 support (GCC >= 7.0 or clang >= 5.0)
+    - [CMake](http://www.cmake.org/download/) (>= 3.12.4)
     - [Lua](http://www.lua.org)
+    - [GameKit dependencies](https://github.com/Unarelith/GameKit#how-to-compile)
     - _Linux users: Check your distribution repositories for packages._
-- Run `cmake .`
-- Run `make -j8`
-- Run the client with `./openminer`
-- If you want a multiplayer game, run the server with `./openminer_server`
+- Run `cmake -B build . && cmake --build build -j8`
+- Or `mkdir build && cd build && cmake .. && make -j8 && cmake ..` (for old CMake versions)
+- Run the client with `./build/openminer`
+- If you want a multiplayer game, run the server with `./build/openminer_server`
 
 ### Using Windows
 
 - [Wiki: Compiling on Windows using CMake and MinGW-w64](https://github.com/Unarelith/OpenMiner/wiki/Compiling-on-Windows-with-MinGW-w64)
 - [Wiki: Compiling on Windows using CMake and Visual Studio 2017](https://github.com/Unarelith/OpenMiner/wiki/Compiling-on-Windows-with-Visual-Studio-2017)
 
+### Using OSX
+
+I don't have an OSX system at the moment. But you can help me create a guide for this OS if you have one!
+
 ## Discussion
 
 - Discord: [join server](https://discord.gg/eN8k8wt)
@@ -104,16 +110,16 @@ This list is non exhaustive.
 - Player model display (currently without rotation nor animation)
 - Dimensions (like the Nether or the Ender in Minecraft) ([#80](https://github.com/Unarelith/OpenMiner/pull/80))
 - World loading/saving (using `/save <name>` and `/load <name>` commands, see [#26](https://github.com/Unarelith/OpenMiner/issues/26))
+- Texture pack system (partially implemented, see [#34](https://github.com/Unarelith/OpenMiner/issues/34))
+- Entities (block drops, mobs, etc...) ([#90](https://github.com/Unarelith/OpenMiner/pull/90))
 
 ### Missing features
 
-- Texture pack system ([#34](https://github.com/Unarelith/OpenMiner/issues/34))
 - Fluid propagation ([#62](https://github.com/Unarelith/OpenMiner/issues/62))
 - Day/night cycle with sun/moon display ([#73](https://github.com/Unarelith/OpenMiner/issues/73))
 - Real worldgen (seed-based, cave tunnels) ([#79](https://github.com/Unarelith/OpenMiner/issues/79))
 - Clouds ([#52](https://github.com/Unarelith/OpenMiner/pull/52))
 - Particle system
-- Entities (block drops, mobs, etc...)
 
 ## Screenshots
 

cmake/FindTinyXml2.cmake

@@ -10,7 +10,7 @@ find_path(TINYXML2_INCLUDE_DIRS NAMES tinyxml2.h)
 find_library(TINYXML2_LIBRARIES NAMES tinyxml2)
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(tinyxml2 DEFAULT_MSG TINYXML2_LIBRARIES TINYXML2_INCLUDE_DIRS)
+find_package_handle_standard_args(TinyXml2 DEFAULT_MSG TINYXML2_LIBRARIES TINYXML2_INCLUDE_DIRS)
 
 mark_as_advanced(TINYXML2_INCLUDE_DIRS TINYXML2_LIBRARIES)
 

cmake/sdl2/FindSDL2.cmake

@@ -315,9 +315,11 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2
                                   VERSION_VAR SDL2_VERSION_STRING)
 
 if(SDL2MAIN_LIBRARY)
+  SET(FPHSA_NAME_MISMATCHED ON)
   FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL2main
                                     REQUIRED_VARS SDL2MAIN_LIBRARY SDL2_INCLUDE_DIR
                                     VERSION_VAR SDL2_VERSION_STRING)
+  SET(FPHSA_NAME_MISMATCHED OFF)
 endif()
 
 

config.example.lua

@@ -1,6 +1,6 @@
 -- You can copy this file as 'config.lua' to load automatically those settings at client startup
 -- Here the default values are set, you can remove options or change them accordingly
--- See client/source/Config.cpp for more details
+-- See source/client/core/Config.cpp for more details
 
 -- Gameplay
 isFlyModeEnabled = false

resources/shaders/game.f.glsl

@@ -2,6 +2,7 @@
 
 varying vec4 v_coord3d;
 varying vec4 v_color;
+varying vec2 v_texCoord;
 varying vec2 v_lightValue;
 varying float v_ambientOcclusion;
 
@@ -10,8 +11,7 @@ varying float v_dist;
 
 uniform int u_renderDistance;
 
-// Get current pixel color
-vec4 getColor();
+uniform sampler2D u_tex;
 
 // Get light color
 vec4 light(vec4 color, vec3 lightColor, vec4 lightPosition, float ambientIntensity, float diffuseIntensity);
@@ -29,9 +29,12 @@ void main() {
 	if(blockFace > -1. && v_dist > u_renderDistance) discard;
 
 	// Get current pixel color and apply multiplier on grayscale textures
-	vec4 color = getColor();
-	if (blockFace > -1 && color != v_color && color.r == color.g && color.g == color.b) {
-		color *= v_color;
+	vec4 color = v_color;
+	if (v_texCoord.x > -0.99 && v_texCoord.y > -0.99) {
+		color = texture2D(u_tex, v_texCoord);
+		if (blockFace > -1 && color.r == color.g && color.g == color.b) {
+			color *= v_color;
+		}
 	}
 
 	// Block breaking animation

server_config.example.lua

@@ -0,0 +1,7 @@
+-- You can copy this file as 'server_config.lua' to load automatically those settings at server startup
+-- Here the default values are set, you can remove options or change them accordingly
+-- See source/server/core/ServerConfig.cpp for more details
+
+-- Gameplay
+useItemDrops = false
+

source/client/CMakeLists.txt

@@ -7,7 +7,7 @@ set(PROJECT_NAME ${CMAKE_PROJECT_NAME})
 # Get source files
 #------------------------------------------------------------------------------
 file(GLOB_RECURSE SOURCE_FILES *.cpp)
-file(GLOB_RECURSE HEADER_FILES *.hpp ../server/*.hpp ../common/*.hpp ../../external/*.hpp)
+file(GLOB_RECURSE HEADER_FILES *.hpp ../server/*.hpp ../common/*.hpp)
 
 foreach(HEADER_FILE ${HEADER_FILES})
 	get_filename_component(HEADER_DIRECTORY ${HEADER_FILE} DIRECTORY)
@@ -49,7 +49,8 @@ endif ()
 
 target_link_libraries(${PROJECT_NAME}
                       ${CMAKE_PROJECT_NAME}_server_lib
-                      ${GAMEKIT_LIBRARIES}
+                      ${CMAKE_PROJECT_NAME}_common
+                      gamekit
                       ${OPENGL_LIBRARIES}
                       ${SDL2_LIBRARIES}
                       ${SDL2_IMAGE_LIBRARIES}
@@ -60,6 +61,5 @@ target_link_libraries(${PROJECT_NAME}
                       ${LUA_LIBRARIES}
                       sfml-system
                       sfml-network
-                      ${UNIX_LIBS}
-                      ${CMAKE_PROJECT_NAME}_common)
+                      ${UNIX_LIBS})
 

source/client/core/ClientApplication.cpp

@@ -58,8 +58,8 @@ void ClientApplication::init() {
 	gk::CoreApplication::init();
 
 	m_window.addVertexAttribute(VertexAttribute::Coord3d, "coord3d", 4, GL_FLOAT, GL_FALSE, sizeof(Vertex), reinterpret_cast<GLvoid *>(offsetof(Vertex, coord3d)));
-	m_window.addVertexAttribute(VertexAttribute::Color, "color", 4, GL_FLOAT, GL_FALSE, sizeof(Vertex), reinterpret_cast<GLvoid *>(offsetof(Vertex, color)));
 	m_window.addVertexAttribute(VertexAttribute::TexCoord, "texCoord", 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), reinterpret_cast<GLvoid *>(offsetof(Vertex, texCoord)));
+	m_window.addVertexAttribute(VertexAttribute::Color, "color", 4, GL_FLOAT, GL_FALSE, sizeof(Vertex), reinterpret_cast<GLvoid *>(offsetof(Vertex, color)));
 	m_window.addVertexAttribute(VertexAttribute::Normal, "normal", 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), reinterpret_cast<GLvoid *>(offsetof(Vertex, normal)));
 	m_window.addVertexAttribute(VertexAttribute::LightValue, "lightValue", 2, GL_FLOAT, GL_FALSE, sizeof(Vertex), reinterpret_cast<GLvoid *>(offsetof(Vertex, lightValue)));
 	m_window.addVertexAttribute(VertexAttribute::AmbientOcclusion, "ambientOcclusion", 1, GL_FLOAT, GL_FALSE, sizeof(Vertex), reinterpret_cast<GLvoid *>(offsetof(Vertex, ambientOcclusion)));