SFTtech · TheJJ · Apr 19, 2015 · Apr 19, 2015 · Apr 19, 2015 · Apr 20, 2015
diff --git a/.gitignore b/.gitignore
@@ -45,3 +45,4 @@ Makefile
 callgrind.out.*
 perf.data*
 .gdb_history
+.ycm_extra_conf.py
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -52,14 +52,24 @@ if(NOT DEFINED WANT_INOTIFY)
 	set(WANT_INOTIFY if_available)
 endif()
 
+if(NOT DEFINED WANT_OPENGL)
+	set(WANT_OPENGL if_available)
+endif()
+
+if(NOT DEFINED WANT_VULKAN)
+	set(WANT_VULKAN if_available)
+endif()
+
 if(NOT DEFINED WANT_GPERFTOOLS_PROFILER)
 	set(WANT_GPERFTOOLS_PROFILER if_available)
 endif()
 
 if(NOT DEFINED WANT_GPERFTOOLS_TCMALLOC)
 	set(WANT_GPERFTOOLS_TCMALLOC false)
 endif()
+# -- options
 
+# set cmake paths
 set(BUILDSYSTEM_DIR "${CMAKE_SOURCE_DIR}/buildsystem")
 set(CMAKE_MODULE_PATH "${BUILDSYSTEM_DIR}" "${BUILDSYSTEM_DIR}/modules/")
 

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Technology     | Component
 **Python3**    | Scripting, media conversion, in-game console, code generation
 **Cython**     | Glue code
 **CMake**      | Build system
-**OpenGL2.1**  | Rendering, shaders
+**OpenGL3.3**  | Rendering, shaders
 **SDL2**       | Cross-platform Audio/Input/Window handling
 **Opus**       | Audio codec
 **Humans**     | Mixing together all of the above

diff --git a/buildsystem/modules/FindInotify.cmake b/buildsystem/modules/FindInotify.cmake
@@ -1,4 +1,4 @@
-# Copyright 2014-2014 the openage authors. See copying.md for legal info.
+# Copyright 2014-2015 the openage authors. See copying.md for legal info.
 
 # This module defines
 #
@@ -8,6 +8,6 @@
 find_path(INOTIFY_INCLUDE_DIR sys/inotify.h HINTS /usr/include/${CMAKE_LIBRARY_ARCHITECTURE})
 
 include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(INOTIFY DEFAULT_MSG INOTIFY_INCLUDE_DIR)
+find_package_handle_standard_args(inotify DEFAULT_MSG INOTIFY_INCLUDE_DIR)
 
 mark_as_advanced(INOTIFY_INCLUDE_DIR)
diff --git a/buildsystem/modules/FindVulkan.cmake b/buildsystem/modules/FindVulkan.cmake
@@ -0,0 +1,50 @@
+# Copyright 2015-2015 the openage authors. See copying.md for legal info.
+#
+# (To distribute this file outside of openage, extend the above
+#  copyright line with an appropriate GPLv3 or later reference,
+#  as you probably don't have a our copying.md)
+
+
+#=================================================================
+# Locate Vulkan graphics library
+#
+# usage:
+#   find_package(Vulkan)
+#
+# This module sets the following variables:
+# VULKAN_FOUND            True, if the system has Vulkan.
+# VULKAN_INCLUDE_DIR      Path to the Vulkan include directory.
+# VULKAN_LIBRARIES        Paths to the Vulkan libraries.
+#=================================================================
+
+set(_Vulkan_REQUIRED_VARS "VULKAN_vk_LIBRARY" "VULKAN_INCLUDE_DIR")
+
+find_path(VULKAN_INCLUDE_DIR
+	VK/vk.h
+	/opt/graphics/Vulkan/include
+)
+
+find_library(VULKAN_vk_LIBRARY
+	NAMES VK Vulkan
+	PATHS
+	/opt/graphics/Vulkan/lib
+)
+
+if(VULKAN_vk_LIBRARY)
+	set(VULKAN_LIBRARIES ${VULKAN_vk_LIBRARY})
+endif()
+
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(
+	Vulkan
+	REQUIRED_VARS ${_Vulkan_REQUIRED_VARS}
+	FAIL_MESSAGE "Vulkan NOT found."
+)
+
+unset(_Vulkan_REQUIRED_VARS)
+
+mark_as_advanced(
+	VULKAN_INCLUDE_DIR
+	VULKAN_vk_LIBRARY
+)
diff --git a/configure b/configure
@@ -69,6 +69,8 @@ def features(args, parser):
     options = {
         "backtrace": "if_available",
         "inotify": "if_available",
+        "opengl": "if_available",
+        "vulkan": "if_available",
         "gperftools-tcmalloc": False,
         "gperftools-profiler": "if_available",
     }

diff --git a/copying.md b/copying.md
@@ -89,6 +89,7 @@ _the openage authors_ are:
 | Johannes Walcher            | tomatower                   | johannes.walcher@stusta.de            |
 | Akritas Akritidis           | MaanooAk                    | akritasak@gmail.com                   |
 | Edgard Mota                 | edgardmota                  | edgardmota@gmail.com                  |
+| Wojciech Nawrocki           | Vtec234                     | wjnawrocki@protonmail.com             |
 
 If you're a first-time commiter, add yourself to the above list. This is not
 just for legal reasons, but also to keep an overview of all those nicknames.

diff --git a/libopenage/CMakeLists.txt b/libopenage/CMakeLists.txt
@@ -40,8 +40,8 @@ add_subdirectory("gui")
 add_subdirectory("error")
 add_subdirectory("gamestate")
 add_subdirectory("input")
-add_subdirectory("log")
 add_subdirectory("job")
+add_subdirectory("log")
 add_subdirectory("pathfinding")
 add_subdirectory("pyinterface")
 add_subdirectory("renderer")
@@ -51,7 +51,7 @@ add_subdirectory("terrain")
 add_subdirectory("testing")
 add_subdirectory("unit")
 add_subdirectory("util")
-
+add_subdirectory("watch")
 
 # run codegen, add files to executable
 codegen_run()
@@ -79,7 +79,6 @@ if(NOT WIN32)
 endif()
 
 find_package(Freetype REQUIRED)
-find_package(OpenGL REQUIRED)
 find_package(SDL2 REQUIRED)
 find_package(SDL2Image REQUIRED)
 find_package(Opusfile REQUIRED)
@@ -134,6 +133,35 @@ else()
 	have_config_option(inotify INOTIFY false)
 endif()
 
+# opengl support
+if(WANT_OPENGL)
+	find_package(OpenGL)
+endif()
+
+# vulkan support
+if(WANT_VULKAN)
+	find_package(Vulkan)
+endif()
+
+if(WANT_OPENGL AND OPENGL_FOUND)
+	have_config_option(opengl OPENGL true)
+	include_directories(${OPENGL_INCLUDE_DIR})
+else()
+	have_config_option(opengl OPENGL false)
+endif()
+
+if(WANT_VULKAN AND VULKAN_FOUND)
+	have_config_option(vulkan VULKAN true)
+	include_directories(${VULKAN_INCLUDE_DIR})
+else()
+	have_config_option(vulkan VULKAN false)
+endif()
+
+if(NOT (OPENGL_FOUND OR VULKAN_FOUND))
+	message(FATAL_ERROR "One of OpenGL or Vulkan is required!")
+endif()
+
+
 get_config_option_string()
 
 configure_file(config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h)

diff --git a/libopenage/assetmanager.cpp b/libopenage/assetmanager.cpp
@@ -2,18 +2,17 @@
 
 #include "assetmanager.h"
 
-#if WITH_INOTIFY
+#ifdef WITH_INOTIFY
 #include <sys/inotify.h>
-#include <unistd.h>
-#include <limits.h> /* for NAME_MAX */
 #endif
 
-#include "util/compiler.h"
-#include "util/file.h"
 #include "error/error.h"
 #include "log/log.h"
-
 #include "texture.h"
+#include "util/compiler.h"
+#include "util/file.h"
+#include "watch/watch.h"
+
 
 namespace openage {
 
@@ -23,13 +22,7 @@ AssetManager::AssetManager(qtsdl::GuiItemLink *gui_link)
 	missing_tex{nullptr},
 	gui_link{gui_link} {
 
-#if WITH_INOTIFY
-	// initialize the inotify instance
-	this->inotify_fd = inotify_init1(IN_NONBLOCK);
-	if (this->inotify_fd < 0) {
-		throw Error{MSG(err) << "Failed to initialize inotify!"};
-	}
-#endif
+	this->watch_manager = watch::WatchManager::create();
 }
 
 util::Dir *AssetManager::get_data_dir() {
@@ -70,14 +63,12 @@ std::shared_ptr<Texture> AssetManager::load_texture(const std::string &name, boo
 		// create the texture!
 		tex = std::make_shared<Texture>(filename, use_metafile);
 
-#if WITH_INOTIFY
-		// create inotify update trigger for the requested file
-		int wd = inotify_add_watch(this->inotify_fd, filename.c_str(), IN_CLOSE_WRITE);
-		if (wd < 0) {
-			throw Error{MSG(warn) << "Failed to add inotify watch for " << filename};
-		}
-		this->watch_fds[wd] = tex;
-#endif
+		this->watch_manager->watch_file(
+			filename,
+			[=](watch::event_type, std::string) {
+				tex->reload();
+			}
+		);
 	}
 
 	// insert the texture into the map and return the texture.
@@ -100,39 +91,7 @@ Texture *AssetManager::get_texture(const std::string &name, bool use_metafile) {
 }
 
 void AssetManager::check_updates() {
-#if WITH_INOTIFY
-	// buffer for at least 4 inotify events
-	char buf[4 * (sizeof(struct inotify_event) + NAME_MAX + 1)];
-	ssize_t len;
-
-	while (true) {
-		// fetch all events, the kernel won't write "half" structs.
-		len = read(this->inotify_fd, buf, sizeof(buf));
-
-		if (len == -1 and errno == EAGAIN) {
-			// no events, nothing to do.
-			break;
-		}
-		else if (len == -1) {
-			throw Error{MSG(err) << "Failed to read inotify events!"};
-		}
-
-		// process fetched events,
-		// the kernel guarantees complete events in the buffer.
-		char *ptr = buf;
-		while (ptr < buf + len) {
-			struct inotify_event *event = (struct inotify_event *)ptr;
-
-			if (event->mask & IN_CLOSE_WRITE) {
-				// TODO: this should invoke callback functions
-				this->watch_fds[event->wd]->reload();
-			}
-
-			// move the buffer ptr to the next event.
-			ptr += sizeof(struct inotify_event) + event->len;
-		}
-	}
-#endif
+	this->watch_manager->check_changes();
 }
 
 std::shared_ptr<Texture> AssetManager::get_missing_tex() {

diff --git a/libopenage/assetmanager.h b/libopenage/assetmanager.h
@@ -2,13 +2,14 @@
 
 #pragma once
 
-#include "config.h"
-
 #include <unordered_map>
 #include <string>
 #include <memory>
 
 #include "util/dir.h"
+#include "watch/watch.h"
+#include "config.h"
+
 
 namespace qtsdl {
 class GuiItemLink;
@@ -53,6 +54,11 @@ class AssetManager final {
 	void check_updates();
 
 protected:
+	/**
+	 * File change monitoring and automatic reloading.
+	 */
+	std::unique_ptr<watch::WatchManager> watch_manager;
+
 	/**
 	 * Create an internal texture handle.
 	 */

diff --git a/libopenage/audio/dynamic_resource.cpp b/libopenage/audio/dynamic_resource.cpp
@@ -4,6 +4,7 @@
 
 #include "../engine.h"
 #include "../log/log.h"
+#include "../job/job_manager.h"
 
 namespace openage {
 namespace audio {

diff --git a/libopenage/config.h.in b/libopenage/config.h.in
@@ -8,6 +8,8 @@
 
 #define WITH_BACKTRACE ${WITH_BACKTRACE}
 #define WITH_INOTIFY ${WITH_INOTIFY}
+#define WITH_OPENGL ${WITH_OPENGL}
+#define WITH_VULKAN ${WITH_VULKAN}
 #define WITH_GPERFTOOLS_PROFILER ${WITH_GPERFTOOLS_PROFILER}
 #define WITH_GPERFTOOLS_TCMALLOC ${WITH_GPERFTOOLS_TCMALLOC}