Compare commits

..

No commits in common. "ab5599f1fc2cc78a685053b779a5b239323500e6" and "e31fd036eab455510a8706425f301ea4d38a6a7a" have entirely different histories.

33 changed files with 585 additions and 636 deletions

3
.gitmodules vendored
View File

@ -4,14 +4,12 @@
[submodule "glm"]
path = libs/glm
url = https://github.com/nigelbarink/glm.git
ignore = untracked
[submodule "spdlog"]
path = libs/spdlog
url = https://github.com/nigelbarink/spdlog.git
[submodule "tinygltf"]
path = libs/tinygltf
url = https://github.com/syoyo/tinygltf.git
ignore = untracked
[submodule "GorrillaAudio"]
path = libs/GorillaAudio
url = https://github.com/mewspring/gorilla-audio.git
@ -24,7 +22,6 @@
[submodule "libs/steam-audio"]
path = libs/steam-audio
url = https://github.com/ValveSoftware/steam-audio.git
ignore = untracked
[submodule "libs/physx"]
path = libs/physx
url = https://git.barink.dev/Nigel/PhysX.git

View File

@ -1,7 +0,0 @@
#pragma once
namespace BECS {
struct Component {
};
}

View File

@ -1,13 +0,0 @@
#pragma once
#include <vector>
#include "Component.h"
namespace BECS {
typedef unsigned long int Entity;
}

View File

@ -1,7 +0,0 @@
#pragma once
namespace BECS {
struct System {
};
}

View File

@ -1,17 +0,0 @@
#pragma once
#include "System.h"
#include <vector>
#include "Component.h"
#include "Entity.h"
namespace BECS {
struct World {
private:
std::vector<System> systems;
std::vector<Component> components;
std::vector<Entity> entities;
};
}

View File

@ -3,13 +3,12 @@
#include "Scene/SceneNodeTypes.h"
#include <glm/glm.hpp>
#include "../../src/Scene/SceneNodeTypes.cpp"
/*
* Define a helper class to more easily build a proper scene
*/
static class SceneBuilder {
static Group* AddGroup(std::string name);
static BarinkEngine::SceneObject* AddVisual(std::string name, BarinkEngine::Renderable& object, glm::vec3 position );
static SceneObject* AddVisual(std::string name, Renderable& object, glm::vec3 position );
};

View File

@ -52,10 +52,10 @@ project "BarinkEngine"
files {
"../libs/glad/src/glad.c",
"./src/*.cpp",
"./Include/*.h",
"./src/**/*.cpp",
"./Include/**/*.h"
"./*.cpp",
"./*.h",
"./**/*.cpp",
"./**/*.h"
}

View File

@ -1,7 +1,8 @@
#include "GUI.h"
void SceneExplorer(Scene& scene, std::string PanelName) {
if (ImGui::Begin(PanelName.c_str())) {
ImGui::Begin(PanelName.c_str());
ImGui::ListBoxHeader("##ObjectList");
Node& current = scene.GetRoot();
@ -23,11 +24,7 @@ void SceneExplorer(Scene& scene, std::string PanelName) {
ImGui::ListBoxFooter();
}
ImGui::End();
}
void CameraTool(Camera* cam) {