diff --git a/engine/include/engine/engine.h b/engine/include/engine/engine.h index 99e9e9e..b5ca99e 100644 --- a/engine/include/engine/engine.h +++ b/engine/include/engine/engine.h @@ -1,10 +1,12 @@ -#ifndef WIN32 +#pragma once + +#ifndef _WIN32 #define GLEW_STATIC #endif #include -#ifdef WIN32 +#ifdef _WIN32 #include #endif diff --git a/sandbox/src/main.cpp b/sandbox/src/main.cpp index d9b2027..8caf6cc 100644 --- a/sandbox/src/main.cpp +++ b/sandbox/src/main.cpp @@ -35,18 +35,18 @@ public: m_registry.emplace(cameraEntity, glm::vec3(0.f, 2.f, 2.f)); m_registry.emplace(cameraEntity); - Object* targetObj = Object::LoadFile("./assets/wizard/wizard.obj"); + Object* targetObj = Object::LoadFile("./assets/monkey.obj"); const auto targetEntity = m_registry.create(); m_registry.emplace(targetEntity, glm::vec3(0.f, 0.0f, 0.f)); m_registry.emplace(targetEntity, std::shared_ptr(targetObj)); - Object* grass = Object::LoadFile("./assets/grass_block/grass_block.obj"); + Object* grass = Object::LoadFile("./assets/cube.obj"); const auto cubeEntity = m_registry.create(); m_registry.emplace(cubeEntity, glm::vec3(-1.5f, 0.4f, 0.f)); m_registry.emplace(cubeEntity, std::shared_ptr(grass)); // Cube template (use shared object to avoid reloading 1000 times) - std::shared_ptr cubeObj = std::shared_ptr(Object::LoadFile("./assets/grass_block/grass_block.obj")); + std::shared_ptr cubeObj = std::shared_ptr(Object::LoadFile("./assets/cube.obj")); const auto batchEntt = m_registry.create(); m_registry.emplace(batchEntt); m_registry.emplace(batchEntt, cubeObj);