Merge pull request #1 from rpgtoolkit/develop

Develop to Master

Author: gamedev-mario

cmake/projects/trans4.cmake

@@ -34,6 +34,8 @@ set(RPGTOOLKIT_TRANS4_HEADERS
   ${RPGTOOLKIT_HEADERS}/trans4/assets/serializers/LegacyTilesetSerializer.hpp
   ${RPGTOOLKIT_HEADERS}/trans4/io/BinaryReader.hpp
   ${RPGTOOLKIT_HEADERS}/trans4/game/Game.hpp
+  ${RPGTOOLKIT_HEADERS}/trans4/scripts/Canvas.hpp
+  ${RPGTOOLKIT_HEADERS}/trans4/scripts/LuaCommand.hpp
   ${RPGTOOLKIT_HEADERS}/trans4/scripts/LuaGameState.hpp
   ${RPGTOOLKIT_HEADERS}/trans4/scripts/LuaScriptEngine.hpp
   ${RPGTOOLKIT_HEADERS}/trans4/scripts/ScriptEngine.hpp
@@ -42,6 +44,8 @@ set(RPGTOOLKIT_TRANS4_HEADERS
 
 set(RPGTOOLKIT_TRANS4_SOURCES
   ${RPGTOOLKIT_SOURCES}/trans4/trans4.cpp
+  ${RPGTOOLKIT_SOURCES}/trans4/Engine.cpp
+  ${RPGTOOLKIT_SOURCES}/trans4/Version.cpp
   ${RPGTOOLKIT_SOURCES}/trans4/assets/AssetHandle.cpp
   ${RPGTOOLKIT_SOURCES}/trans4/assets/AssetRepository.cpp
   ${RPGTOOLKIT_SOURCES}/trans4/assets/GameManifest.cpp
@@ -54,6 +58,8 @@ set(RPGTOOLKIT_TRANS4_SOURCES
   ${RPGTOOLKIT_SOURCES}/trans4/assets/serializers/LegacyTilesetSerializer.cpp
   ${RPGTOOLKIT_SOURCES}/trans4/game/Game.cpp
   ${RPGTOOLKIT_SOURCES}/trans4/io/BinaryReader.cpp
+  ${RPGTOOLKIT_SOURCES}/trans4/scripts/Canvas.cpp
+  ${RPGTOOLKIT_SOURCES}/trans4/scripts/LuaCommand.cpp
   ${RPGTOOLKIT_SOURCES}/trans4/scripts/LuaGameState.cpp
   ${RPGTOOLKIT_SOURCES}/trans4/scripts/LuaScriptEngine.cpp
   ${RPGTOOLKIT_SOURCES}/trans4/scripts/ScriptEngine.cpp

include/trans4/Engine.hpp

@@ -1,3 +1,8 @@
+/// \copyright
+///
+/// See LICENSE.md in the distribution for the full license text including,
+/// but not limited to, a notice of warranty and distribution rights.
+
 #ifndef RPGTOOLKIT_TRANS4_ENGINE_INCLUDED
 #define RPGTOOLKIT_TRANS4_ENGINE_INCLUDED
 
@@ -7,6 +12,8 @@
 #include "clio/system/SystemSettings.hpp"
 #include "clio/window/Window.hpp"
 #include "clio/common/Logger.hpp"
+#include "clio/graphics/Texture.hpp"
+#include "clio/graphics/Renderer2D.hpp"
 
 #include "Version.hpp"
 #include "game/Game.hpp"
@@ -24,110 +31,28 @@ namespace rpgtoolkit {
 
     struct Engine {
 
-        const char * DEFAULT_LOG_FILENAME = "trans4.log";
-        const char * DEFAULT_SCRIPT_FILENAME = "main.lua";
-
-        static Engine & GetInstance() {
-
-            static Engine instance;
-            return instance;
-
-        }
+        static Engine & GetInstance();
 
         void
-        Configure() {
-
-            clio::SystemSettings settings;
-
-            // Configure default system settings
-
-            settings.window.x = settings.window.POSITION_CENTERED;
-            settings.window.y = settings.window.POSITION_CENTERED;
-            settings.window.width = 640;
-            settings.window.height = 480;
-            settings.window.init_flags = 0;
-
-            // Look for a game manifest in the current working directory
-            // and load settings from this file.
-
-            auto manifest = assets_.Load<GameManifest>("file://main.gam");
-
-            if (manifest) {
-
-                settings.window.width = manifest->GetResolutionWidth();
-                settings.window.height = manifest->GetResolutionHeight();
-
-                switch (manifest->GetDisplayMode()) {
-                    case DisplayMode::FULLSCREEN:
-                        settings.window.init_flags |= settings.window.FULLSCREEN;
-                        break;
-                    case DisplayMode::BORDERLESS:
-                        settings.window.init_flags |= settings.window.BORDERLESS;
-                        break;
-                    default:
-                        break;
-                }
-
-            }
-
-            system_->Initialize(settings);
-
-            system_->GetWindow()->SetTitle(
-                manifest ? manifest->GetTitle() : "RPG Toolkit 4.0");
-
-        }
+        Configure();
 
         void
-        Run() {
-
-            LOG(&log_, "RPG Toolkit %s", GetVersion().ToString().c_str());
-
-            scripting_.Run(DEFAULT_SCRIPT_FILENAME);
-            game_.Run();
-
-        }
+        Run();
 
         ScriptEngine &
-        GetScriptEngine() {
-
-            return scripting_;
-
-        }
+        GetScriptEngine();
 
         AssetRepository &
-        GetAssets() {
-
-            return assets_;
-
-        }
+        GetAssets();
 
         clio::Logger
-        GetLog() {
-
-            return log_;
-
-        }
+        GetLog();
 
         Game &
-        GetGame() {
-
-            return game_;
-
-        }
+        GetGame();
 
         Version const &
-        GetVersion() const {
-
-            static Version v(
-                RPGTOOLKIT_VERSION_MAJOR,
-                RPGTOOLKIT_VERSION_MINOR,
-                RPGTOOLKIT_VERSION_PATCH,
-                RPGTOOLKIT_VERSION_RELEASE,
-                RPGTOOLKIT_VERSION_METADATA);
-
-            return v;
-
-        }
+        GetVersion() const;
 
     private:
 
@@ -143,22 +68,7 @@ namespace rpgtoolkit {
 
         Engine(Engine const & rhs) = delete;
 
-        Engine()
-            : system_(new clio::System()),
-              log_(DEFAULT_LOG_FILENAME),
-              game_(system_.get()) {
-
-            // Initialize the scripting runtime
-
-            scripting_.Initialize(&game_, system_.get());
-
-            // Initialize supported repository resolvers and serializers
-
-            assets_.RegisterSerializer<LegacyGameManifestSerializer>();
-            assets_.RegisterSerializer<LegacyTilesetSerializer>();
-            assets_.RegisterResolver<FileAssetHandleResolver>();
-
-        }
+        Engine();
 
     };
 

include/trans4/Version.hpp

@@ -1,21 +1,25 @@
+/// \copyright
+///
+/// See LICENSE.md in the distribution for the full license text including,
+/// but not limited to, a notice of warranty and distribution rights.
+
 #ifndef RPGTOOLKIT_TRANS4_VERSION_INCLUDED
 #define RPGTOOLKIT_TRANS4_VERSION_INCLUDED
 
 #include <string>
 #include <ostream>
-#include <sstream>
 
 namespace rpgtoolkit {
 
-    const int RPGTOOLKIT_VERSION_MAJOR = 4;
+    static const int RPGTOOLKIT_VERSION_MAJOR = 4;
 
-    const int RPGTOOLKIT_VERSION_MINOR = 0;
+    static const int RPGTOOLKIT_VERSION_MINOR = 0;
 
-    const int RPGTOOLKIT_VERSION_PATCH = 0;
+    static const int RPGTOOLKIT_VERSION_PATCH = 0;
 
-    const char * RPGTOOLKIT_VERSION_RELEASE = "alpha";
+    static const char RPGTOOLKIT_VERSION_RELEASE[] = "alpha";
 
-    const char * RPGTOOLKIT_VERSION_METADATA = "";
+    static const char RPGTOOLKIT_VERSION_METADATA[] = "";
 
     using std::string;
     using std::stringstream;
@@ -25,55 +29,27 @@ namespace rpgtoolkit {
     struct Version {
 
         Version(short major, short minor, short patch,
-            string const & release, string const & metadata)
-            : major_(major), minor_(minor), patch_(patch),
-              release_(release), metadata_(metadata) {
-        }
+            string const & release, string const & metadata);
 
-        Version(short major, short minor, short patch)
-            : major_(major), minor_(minor), patch_(patch) {
-        }
+        Version(short major, short minor, short patch);
 
         short
-        GetMajor() const {
-            return major_;
-        }
+        GetMajor() const;
 
         short
-        GetMinor() const {
-            return minor_;
-        }
+        GetMinor() const;
 
         short
-        GetPatch() const {
-            return patch_;
-        }
+        GetPatch() const;
 
         string const &
-        GetRelease() const {
-            return release_;
-        }
+        GetRelease() const;
 
         string const &
-        GetBuildMetadata() const {
-            return metadata_;
-        }
+        GetBuildMetadata() const;
 
         string const
-        ToString() const {
-            stringstream buffer;
-            buffer << major_ << ".";
-            buffer << minor_ << ".";
-            buffer << patch_;
-            if (!release_.empty()) {
-                buffer << "-" << release_;
-            }
-            if (!metadata_.empty()) {
-                buffer << "+" << metadata_;
-            }
-            return buffer.str();
-        }
-
+        ToString() const;
 
     private:
 

include/trans4/assets/Tileset.hpp

@@ -24,7 +24,6 @@ namespace rpgtoolkit {
 
     struct Tileset : public Asset {
 
-
         Tileset (size_t dimension, size_t count);
 
         size_t
@@ -33,15 +32,15 @@ namespace rpgtoolkit {
         size_t
         GetTileDimensions() const;
 
-        uint32_t *
+        char *
         GetImageBuffer();
 
     private:
 
         size_t dimension_;
         size_t count_;
 
-        unique_ptr<uint32_t[]> buffer_;
+        unique_ptr<char[]> buffer_;
 
     };
 

include/trans4/scripts/Canvas.hpp

@@ -0,0 +1,49 @@
+/// \copyright
+///
+/// See LICENSE.md in the distribution for the full license text including,
+/// but not limited to, a notice of warranty and distribution rights.
+
+#ifndef RPGTOOLKIT_TRANS4_SCRIPTS_CANVAS_INCLUDED
+#define RPGTOOLKIT_TRANS4_SCRIPTS_CANVAS_INCLUDED
+
+#include <cstdint>
+#include <memory>
+
+namespace clio {
+	struct Texture;
+	struct TextureClip;
+	struct Renderer2D;
+}
+
+namespace rpgtoolkit {
+	struct Canvas {
+	public:
+		Canvas(clio::Renderer2D* renderer, size_t width, size_t height);
+
+		~Canvas();
+
+		void Render(int x, int y);
+
+		void DrawTexture(clio::Texture *texture, int x, int y, int w = 0, int h = 0);
+
+		void DrawTextureClip(clio::Texture* tex, int x, int y, int source_x, int source_y, int width, int height);
+
+		void DrawPixel(int x, int y);
+
+		void DrawLine(int x1, int y1, int x2, int y2);
+
+		void DrawRect(int x, int y, int width, int height);
+
+		void FillRect(int x, int y, int width, int height);
+
+		Canvas(Canvas const&);
+
+		Canvas & operator=(Canvas &);
+	private:		
+		clio::Renderer2D* renderer_;
+
+		std::unique_ptr<clio::Texture> texture_;
+	};
+}
+
+#endif

include/trans4/scripts/LuaCommand.hpp

@@ -0,0 +1,23 @@
+#ifndef RPGTOOLKIT_TRANS4_SCRIPTS_LUACOMMAND_INCLUDED
+#define RPGTOOLKIT_TRANS4_SCRIPTS_LUACOMMAND_INCLUDED
+
+#include "lua.hpp"
+#include "LuaBridge.h"
+
+namespace rpgtoolkit {
+	struct LuaCommand {
+	public:
+		LuaCommand(lua_State* L, const std::string& table, const std::string& function);
+
+		~LuaCommand();
+
+		/// \brief Execute the lua function
+		void Execute();
+	private:
+		std::string function_;
+
+		luabridge::LuaRef luaTable_;
+	};
+}
+
+#endif