Skip to content

Commit

Permalink
update rigid body
Browse files Browse the repository at this point in the history
  • Loading branch information
@C6H5-NO2
C6H5-NO2 committed Jul 13, 2019
1 parent 2a8a631 commit 42a1a61
Show file tree
Hide file tree
Showing 36 changed files with 1,081 additions and 853 deletions.
292 changes: 146 additions & 146 deletions MixEngine.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,161 +1,161 @@
#include "MixEngine.h"
#include "Mx/Time/MxTime.h"
#include "Mx/Audio/MxAudio.hpp"
#include "Mx/Input/MxInput.h"
#include "Mx/Window/MxWindow.h"
#include "Mx/Audio/MxAudio.hpp"
#include "Mx/Physics/MxPhysicsWorld.h"
#include "Mx/Vulkan/MxVkGraphics.h"
#include "Mx/Vulkan/Renderer/PresetRenderer/MxVkStandardRenderer.h"
#include "Mx/Resource/MxResourceLoader.h"
#include "Mx/GUI/MxUi.h"
#include "Mx/GameObject/MxGameObject.h"
#include "Mx/Resource/MxResourceLoader.h"

namespace Mix {
MixEngine::MixEngine(int _argc, char** _argv) : mQuit(false),
mWindow(nullptr),
mDebugScene("Debug Scene") {
}

MixEngine::~MixEngine() {
mModuleHolder.get<Audio::Core>()->release();
delete mWindow;
SDL_Quit();
}

int MixEngine::exec() {
try {
awake();
init();
SDL_Event event;
while (!mQuit) {
while (SDL_PollEvent(&event)) {
process(event);
}
update();
lateUpdate();
render();
}
}
catch (const std::exception& e) {
std::cerr << e.what() << std::endl;
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}

void MixEngine::awake() {
if (SDL_Init(SDL_INIT_VIDEO))
throw ThirdPartyLibInitError("SDL2");

auto fmodCore = mModuleHolder.add<Audio::Core>();
fmodCore->awake();

Time::Awake();
Input::Init();

// todo test graphics
mWindow = new Window("Mix Engine Demo", { 1400, 900 });
mWindow->SetRelativeMouseMode(true);

auto instanceExtsReq = mWindow->getRequiredInstanceExts();
instanceExtsReq.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);

std::vector<const char*> deviceExtsReq;
deviceExtsReq.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME);

std::vector<const char*> layersReq;
layersReq.push_back("VK_LAYER_LUNARG_standard_validation");

Graphics::VulkanSettings settings;
settings.appInfo.appName = "Demo";
settings.appInfo.appVersion = Version::MakeVersion(0, 0, 1);
settings.debugMode = true;
settings.instanceExts = instanceExtsReq;
settings.deviceExts = deviceExtsReq;
settings.validationLayers = layersReq;
settings.physicalDeviceIndex = 0;

auto vulkan = mModuleHolder.add<Graphics::Vulkan>();
vulkan->init();

Debug::Log::Info("Instance Extensions:");

auto instanceExts = Graphics::Vulkan::GetAllSupportedInstanceExts();
for (auto& ext : instanceExts) {
Debug::Log::Info("--%s", ext.extensionName);
}

Debug::Log::Info("Validation Layers:");

auto layers = Graphics::Vulkan::GetAllSupportedLayers();
for (auto& layer : layers) {
Debug::Log::Info("--%s", layer.layerName);
}

vulkan->setTargetWindow(mWindow);
vulkan->build(settings);

auto ui = mModuleHolder.add<Ui>();
ui->init();

auto resourceLoader = mModuleHolder.add<Resource::ResourceLoader>();
resourceLoader->init();

auto mainRendererIndex = vulkan->addRenderer<Graphics::StandardRenderer>();
vulkan->setActiveRenderer(mainRendererIndex);

mDebugScene.awake();
}

void MixEngine::init() {
mDebugScene.init();
}

void MixEngine::process(const SDL_Event& _event) {
if (_event.type == SDL_QUIT) {
mQuit = true;
return;
}

getModule<Ui>()->process(_event);
Input::Process(_event);
}

void MixEngine::update() {
Time::Update();
getModule<Ui>()->update();

// calculate fps
static auto startTp = Time::TotalTime();
if (++mFrameCount > mFrameSampleRate) {
mFramePerSecond = mFrameCount / (Time::TotalTime() - startTp);
startTp = Time::TotalTime();
mFrameCount = 0u;
}
mWindow->setTitle(std::to_string(mFramePerSecond));
// -----

mDebugScene.update();
MixEngine::MixEngine(int _argc, char** _argv) : mQuit(false),
mWindow(nullptr),
mDebugScene("Debug Scene") {}

MixEngine::~MixEngine() {
//mModuleHolder.get<Audio::Core>()->release();
delete mWindow;
SDL_Quit();
}

int MixEngine::exec() {
try {
awake();
init();
SDL_Event event;
while(!mQuit) {
while(SDL_PollEvent(&event)) {
process(event);
}
update();
lateUpdate();
render();
}
}
catch(const std::exception& e) {
std::cerr << e.what() << std::endl;
return EXIT_FAILURE;
}
return EXIT_SUCCESS;
}

void MixEngine::awake() {
if(SDL_Init(SDL_INIT_VIDEO))
throw ThirdPartyLibInitError("SDL2");

mModuleHolder.add<Audio::Core>()->awake();

mModuleHolder.add<Physics::World>()->awake();

Time::Awake();
Input::Awake();

// todo test graphics
mWindow = new Window("Mix Engine Demo", {1400, 900});
Window::SetRelativeMouseMode(true);

auto instanceExtsReq = mWindow->getRequiredInstanceExts();
instanceExtsReq.push_back(VK_EXT_DEBUG_UTILS_EXTENSION_NAME);

std::vector<const char*> deviceExtsReq;
deviceExtsReq.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME);

std::vector<const char*> layersReq;
layersReq.push_back("VK_LAYER_LUNARG_standard_validation");

Graphics::VulkanSettings settings;
settings.appInfo.appName = "Demo";
settings.appInfo.appVersion = Version::MakeVersion(0, 0, 1);
settings.debugMode = true;
settings.instanceExts = instanceExtsReq;
settings.deviceExts = deviceExtsReq;
settings.validationLayers = layersReq;
settings.physicalDeviceIndex = 0;

auto vulkan = mModuleHolder.add<Graphics::Vulkan>();
vulkan->init();

Debug::Log::Info("Instance Extensions:");

auto instanceExts = Graphics::Vulkan::GetAllSupportedInstanceExts();
for(auto& ext : instanceExts) {
Debug::Log::Info("--%s", ext.extensionName);
}

Debug::Log::Info("Validation Layers:");

auto layers = Graphics::Vulkan::GetAllSupportedLayers();
for(auto& layer : layers) {
Debug::Log::Info("--%s", layer.layerName);
}

vulkan->setTargetWindow(mWindow);
vulkan->build(settings);

auto ui = mModuleHolder.add<Ui>();
ui->init();

auto resourceLoader = mModuleHolder.add<Resource::ResourceLoader>();
resourceLoader->init();

auto mainRendererIndex = vulkan->addRenderer<Graphics::StandardRenderer>();
vulkan->setActiveRenderer(mainRendererIndex);

mDebugScene.awake();
}

void MixEngine::init() {
mDebugScene.init();
}

void MixEngine::process(const SDL_Event& _event) {
if(_event.type == SDL_QUIT) {
mQuit = true;
return;
}

mModuleHolder.get<Ui>()->process(_event);
Input::Process(_event);
}

void MixEngine::update() {
Time::Tick();
mModuleHolder.get<Physics::World>()->sync(Time::FixedDeltaTime(), Time::SmoothingFactor());
mModuleHolder.get<Ui>()->update();

// calculate fps
static auto startTp = Time::TotalTime();
if(++mFrameCount > mFrameSampleRate) {
mFramePerSecond = mFrameCount / (Time::TotalTime() - startTp);
startTp = Time::TotalTime();
mFrameCount = 0u;
}
mWindow->setTitle(std::to_string(mFramePerSecond));
// -----

mDebugScene.update();

for (auto i = 0u; i < Time::sFixedClampedSteps; ++i)
fixedUpdate();
}
for(auto i = 0u; i < Time::sFixedClampedSteps; ++i)
fixedUpdate();
}

void MixEngine::fixedUpdate() {
// todo: call bullet3
void MixEngine::fixedUpdate() {
mModuleHolder.get<Physics::World>()->step(Time::FixedDeltaTime());

mDebugScene.fixedUpate();
}
mDebugScene.fixedUpate();
}

void MixEngine::lateUpdate() {
mDebugScene.lateUpate();
void MixEngine::lateUpdate() {
mDebugScene.lateUpate();

mModuleHolder.get<Audio::Core>()->update();
Input::Reset();
}
mModuleHolder.get<Audio::Core>()->update();
Input::Reset();
}

void MixEngine::render() {
mModuleHolder.get<Ui>()->render();
mModuleHolder.get<Graphics::Vulkan>()->update();
mModuleHolder.get<Graphics::Vulkan>()->render();
}
void MixEngine::render() {
mModuleHolder.get<Ui>()->render();
mModuleHolder.get<Graphics::Vulkan>()->update();
mModuleHolder.get<Graphics::Vulkan>()->render();
}
}
2 changes: 1 addition & 1 deletion MixEngine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Mix {
Window& getWindow() { return *mWindow; }

// ----- ModuleHolder -----

template<typename _Ty>
bool hasModule() const { return mModuleHolder.has<_Ty>(); }

Expand Down
5 changes: 0 additions & 5 deletions Mx/Audio/MxAudio.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@

#include "../Engine/MxModuleBase.h"
#include <fmod/fmod.hpp>
#include <glm/vec3.hpp>

namespace Mix::Audio {
enum class LoadType {
Expand All @@ -26,10 +25,6 @@ namespace Mix::Audio {
DYNAMIC
};

inline FMOD_VECTOR glmVec3ToFmodVec(const glm::vec3& _vec) {
return {_vec.x, _vec.y, _vec.z};
}

class Core final : public ModuleBase {
public:
Core() : mCore(nullptr) {}
Expand Down
Loading

0 comments on commit 42a1a61

Please sign in to comment.