Confusing refactor of library (Trust me it'll come out making sense)
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
#include <ReWindow/InputService.h>
|
||||
#include <TestGame/Player.hpp>
|
||||
#include <DemoGame/Player.hpp>
|
||||
#include <JGL/JGL.h>
|
||||
|
||||
TestGame::Player::Player(const Vector2 &spawn_pos): GameEntity(spawn_pos) {
|
@@ -1,4 +1,4 @@
|
||||
#include <TestGame/TestGameApp.hpp>
|
||||
#include <DemoGame/TestGameApp.hpp>
|
||||
|
||||
#include "JUI/Widgets/FpsGraph.hpp"
|
||||
#include <JUI/Widgets/ListLayout.hpp>
|
@@ -1,12 +1,12 @@
|
||||
#include <JUI/Widgets/ImageRect.hpp>
|
||||
|
||||
#include <App/EditorApp.hpp>
|
||||
#include <App/NewMapDialog.hpp>
|
||||
#include <Editor/EditorApp.hpp>
|
||||
#include <Editor/NewMapDialog.hpp>
|
||||
|
||||
#include <Data/Format.hpp>
|
||||
#include <Format/Format.hpp>
|
||||
|
||||
#include "JUI/Widgets/FpsGraph.hpp"
|
||||
#include <App/Grid.hpp>
|
||||
#include <Editor/Grid.hpp>
|
||||
|
||||
|
||||
JUI::Window* EditorApp::CreateAppInfoDialogWindow(JUI::Widget* parent)
|
@@ -1,4 +1,4 @@
|
||||
#include <App/EditorCamera.hpp>
|
||||
#include <Editor/EditorCamera.hpp>
|
||||
|
||||
Matrix4x4 EditorCamera::CurrentTranslationMatrix() const
|
||||
{
|
@@ -1,4 +1,4 @@
|
||||
#include <App/LayerView.hpp>
|
||||
#include <Editor/LayerView.hpp>
|
||||
|
||||
LayerView::LayerView(): JUI::Window() {
|
||||
this->Title("Layers");
|
@@ -1,4 +1,4 @@
|
||||
#include <App/TileMetaDialog.hpp>
|
||||
#include <Editor/TileMetaDialog.hpp>
|
||||
|
||||
|
||||
TileMetaDialog::TileMetaDialog(): JUI::Window() {
|
@@ -1,4 +1,4 @@
|
||||
#include <Data/Entity.hpp>
|
||||
#include <Format/Entity.hpp>
|
||||
|
||||
Entity::Entity():
|
||||
x(0), y(0),
|
@@ -1,4 +1,4 @@
|
||||
#include <Data/Layer.hpp>
|
||||
#include <Format/Layer.hpp>
|
||||
|
||||
Layer::Layer(): rows(0), cols(0), cell_width(0), cell_height(0), parallax_x(0), parallax_y(0), cells(nullptr), visible(true), order(0)
|
||||
{ }
|
@@ -1,4 +1,4 @@
|
||||
#include <Data/Level.hpp>
|
||||
#include <Format/Level.hpp>
|
||||
|
||||
|
||||
Level::Level(): rows(0), cols(0)
|
@@ -1,4 +1,4 @@
|
||||
#include <Data/Tileset.hpp>
|
||||
#include <Format/Tileset.hpp>
|
||||
|
||||
Tileset::Tileset():
|
||||
tile_width(0),tile_height(0), tile_spacing(0),
|
@@ -1,9 +1,9 @@
|
||||
#include <Colors.hpp>
|
||||
#include <Utils.hpp>
|
||||
#include <Re2DLevelAPI.hpp>
|
||||
#include <fstream>
|
||||
|
||||
|
||||
Color4 JsonConversions::parse_color(const JJX::json::value& v)
|
||||
Color4 JsonConversions::parse_color(const json::value& v)
|
||||
{
|
||||
if (v.type == json::value_type::string)
|
||||
return Color4::FromHex(v.string.value());
|
||||
@@ -35,12 +35,12 @@ Color4 JsonConversions::parse_color(const JJX::json::value& v)
|
||||
return Colors::Transparent;
|
||||
}
|
||||
|
||||
JJX::json::value JsonConversions::deparse_color_to_hex(const Color4& color)
|
||||
json::value JsonConversions::deparse_color_to_hex(const Color4& color)
|
||||
{
|
||||
return JJX::json::string(color.ToHexAlpha());
|
||||
return json::string(color.ToHexAlpha());
|
||||
}
|
||||
|
||||
std::vector<std::string> JsonConversions::parse_string_list(const JJX::json::value& v)
|
||||
std::vector<std::string> JsonConversions::parse_string_list(const json::value& v)
|
||||
{
|
||||
// TODO: Log an error if the json value is an invalid type.
|
||||
if (v.type == json::value_type::string)
|
||||
@@ -58,11 +58,11 @@ std::vector<std::string> JsonConversions::parse_string_list(const JJX::json::val
|
||||
return {};
|
||||
}
|
||||
|
||||
JJX::json::value JsonConversions::deparse_string_list(const std::vector<std::string>& list)
|
||||
json::value JsonConversions::deparse_string_list(const std::vector<std::string>& list)
|
||||
{
|
||||
json::array strlist;
|
||||
for (auto& str : list)
|
||||
strlist.push_back(str);
|
||||
strlist.push_back(json::string(str));
|
||||
|
||||
return strlist;
|
||||
}
|
Reference in New Issue
Block a user