Skip to content

Commit

Permalink
Fixing linux build (6) #5
Browse files Browse the repository at this point in the history
  • Loading branch information
@dtrajko
dtrajko committed Apr 11, 2021
1 parent 91bf01f commit 8d1c785
Show file tree
Hide file tree
Showing 14 changed files with 78 additions and 63 deletions.
1 change: 1 addition & 0 deletions MoravaEngine/src/Hazel/Renderer/RenderCommandQueue.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

#include <memory>
#include <functional>
#include <cstring>


namespace Hazel {
Expand Down
3 changes: 1 addition & 2 deletions MoravaEngine/src/Hazel/Renderer/ShaderUniform.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#pragma once

#include "ShaderUniform.h"


Expand All @@ -25,3 +23,4 @@ namespace Hazel {
}

}

2 changes: 1 addition & 1 deletion MoravaEngine/src/Hazel/Scene/Entity.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ namespace Hazel {
}

TransformComponent& Transform() { return m_Scene->m_Registry.get<TransformComponent>(m_EntityHandle); }
const glm::mat4& Transform() const { return m_Scene->m_Registry.get<TransformComponent>(m_EntityHandle).GetTransform(); }
glm::mat4 Transform() const { return m_Scene->m_Registry.get<TransformComponent>(m_EntityHandle).GetTransform(); }

void SetMaterial(Material* material) { m_Material = material; }
Material* GetMaterial() { return m_Material; }
Expand Down
8 changes: 4 additions & 4 deletions MoravaEngine/src/Hazel/Scene/HazelScene.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ namespace Hazel {

// Render 2D
HazelCamera* mainCamera = nullptr;
glm::mat4* cameraTransform = nullptr;
glm::mat4 cameraTransform = glm::mat4(1.0f);
{
auto view = m_Registry.view<TransformComponent, CameraComponent>();

Expand All @@ -255,7 +255,7 @@ namespace Hazel {
if (camera.Primary)
{
mainCamera = &camera.Camera;
cameraTransform = &transform.GetTransform();
cameraTransform = transform.GetTransform();
break;
}
}
Expand Down Expand Up @@ -296,7 +296,7 @@ namespace Hazel {
SceneRenderer::BeginScene(this, { editorCamera, editorCamera.GetViewMatrix() });
for (auto entity : group)
{
auto& [meshComponent, transformComponent] = group.get<MeshComponent, TransformComponent>(entity);
auto [meshComponent, transformComponent] = group.get<MeshComponent, TransformComponent>(entity);
if (meshComponent.Mesh)
{
meshComponent.Mesh->OnUpdate(ts, false);
Expand Down Expand Up @@ -742,7 +742,7 @@ namespace Hazel {
template<typename T>
void HazelScene::OnComponentAdded(Entity entity, T& component)
{
static_assert(false);
// static_assert(false);
}

template<>
Expand Down
7 changes: 4 additions & 3 deletions MoravaEngine/src/Hazel/Scene/HazelScene.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,10 @@ namespace Hazel {
uint32_t m_ViewportWidth = 0;
uint32_t m_ViewportHeight = 0;

private:
EntityMap m_EntityIDMap;

private:

HazelCamera m_Camera;
HazelLight m_Light;
float m_LightMultiplier = 0.3f;
Expand All @@ -141,8 +142,8 @@ namespace Hazel {
friend class SceneSerializer;
friend class SceneHierarchyPanel;

friend void OnScriptComponentConstruct(entt::registry& registry, entt::entity entity);
friend void OnScriptComponentDestroy(entt::registry& registry, entt::entity entity);
// friend void OnScriptComponentConstruct(entt::registry& registry, entt::entity entity);
// friend void OnScriptComponentDestroy(entt::registry& registry, entt::entity entity);

};

Expand Down
6 changes: 3 additions & 3 deletions MoravaEngine/src/Hazel/Scene/SceneSerializer.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ namespace Hazel {
out << YAML::Key << "TransformComponent";
out << YAML::BeginMap; // TransformComponent

auto& transform = entity.GetComponent<TransformComponent>().GetTransform();
auto transform = entity.GetComponent<TransformComponent>().GetTransform();
auto [pos, rot, scale] = GetTransformDecomposition(transform);

out << YAML::Key << "Position" << YAML::Value << pos;
Expand Down Expand Up @@ -485,7 +485,7 @@ namespace Hazel {
if (transformComponent)
{
// Entities always have transforms
auto& transform = deserializedEntity.GetComponent<TransformComponent>().GetTransform();
auto transform = deserializedEntity.GetComponent<TransformComponent>().GetTransform();
glm::vec3 translation = transformComponent["Position"].as<glm::vec3>();
glm::quat rotation = transformComponent["Rotation"].as<glm::quat>();
glm::vec3 scale = transformComponent["Scale"].as<glm::vec3>();
Expand Down Expand Up @@ -592,7 +592,7 @@ namespace Hazel {
auto& component = deserializedEntity.AddComponent<CameraComponent>();
component.Camera = SceneCamera();

auto& cameraProps = cameraComponent["Camera"];
auto cameraProps = cameraComponent["Camera"];
component.Camera.SetProjectionType((SceneCamera::ProjectionType)cameraProps["ProjectionType"].as<int>());

component.Camera.SetPerspectiveVerticalFOV(cameraProps["PerspectiveFOV"].as<float>());
Expand Down
20 changes: 14 additions & 6 deletions MoravaEngine/src/Hazel/Script/ScriptEngine.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
#include "ScriptEngine.h"

#include "ScriptEngineRegistry.h"

#include "Hazel/Scene/HazelScene.h"

#include <mono/jit/jit.h>
#include <mono/metadata/assembly.h>
#include <mono/metadata/debug-helpers.h>
Expand All @@ -10,12 +14,10 @@
#include <thread>
#include <filesystem>

#include <Windows.h>
#include <winioctl.h>

#include "ScriptEngineRegistry.h"

#include "../Scene/HazelScene.h"
#if defined(HZ_PLATFORM_WINDOWS)
#include <Windows.h>
#include <winioctl.h>
#endif

#include "imgui.h"

Expand Down Expand Up @@ -75,6 +77,8 @@ namespace Hazel
return NULL;
}

#if defined(HZ_PLATFORM_WINDOWS)

HANDLE file = CreateFileA(filepath, FILE_READ_ACCESS, 0, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (file == INVALID_HANDLE_VALUE)
{
Expand Down Expand Up @@ -115,6 +119,10 @@ namespace Hazel
CloseHandle(file);
mono_image_close(image);
return assemb;

#endif

return nullptr;
}

static void InitMono()
Expand Down
58 changes: 29 additions & 29 deletions MoravaEngine/src/Hazel/Script/ScriptEngineRegistry.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,44 +45,44 @@ namespace Hazel {
{
InitComponentTypes();

mono_add_internal_call("Hazel.Noise::PerlinNoise_Native", Hazel::Script::Hazel_Noise_PerlinNoise);
mono_add_internal_call("Hazel.Noise::PerlinNoise_Native", (const void*)Hazel::Script::Hazel_Noise_PerlinNoise);

mono_add_internal_call("Hazel.Entity::GetTransform_Native", Hazel::Script::Hazel_Entity_GetTransform);
mono_add_internal_call("Hazel.Entity::SetTransform_Native", Hazel::Script::Hazel_Entity_SetTransform);
mono_add_internal_call("Hazel.Entity::CreateComponent_Native", Hazel::Script::Hazel_Entity_CreateComponent);
mono_add_internal_call("Hazel.Entity::HasComponent_Native", Hazel::Script::Hazel_Entity_HasComponent);
mono_add_internal_call("Hazel.Entity::FindEntityByTag_Native", Hazel::Script::Hazel_Entity_FindEntityByTag);
mono_add_internal_call("Hazel.Entity::GetTransform_Native", (const void*)Hazel::Script::Hazel_Entity_GetTransform);
mono_add_internal_call("Hazel.Entity::SetTransform_Native", (const void*)Hazel::Script::Hazel_Entity_SetTransform);
mono_add_internal_call("Hazel.Entity::CreateComponent_Native", (const void*)Hazel::Script::Hazel_Entity_CreateComponent);
mono_add_internal_call("Hazel.Entity::HasComponent_Native", (const void*)Hazel::Script::Hazel_Entity_HasComponent);
mono_add_internal_call("Hazel.Entity::FindEntityByTag_Native", (const void*)Hazel::Script::Hazel_Entity_FindEntityByTag);

mono_add_internal_call("Hazel.MeshComponent::GetMesh_Native", Hazel::Script::Hazel_MeshComponent_GetMesh);
mono_add_internal_call("Hazel.MeshComponent::SetMesh_Native", Hazel::Script::Hazel_MeshComponent_SetMesh);
mono_add_internal_call("Hazel.MeshComponent::GetMesh_Native", (const void*)Hazel::Script::Hazel_MeshComponent_GetMesh);
mono_add_internal_call("Hazel.MeshComponent::SetMesh_Native", (const void*)Hazel::Script::Hazel_MeshComponent_SetMesh);

mono_add_internal_call("Hazel.RigidBody2DComponent::ApplyLinearImpulse_Native", Hazel::Script::Hazel_RigidBody2DComponent_ApplyLinearImpulse);
mono_add_internal_call("Hazel.RigidBody2DComponent::GetLinearVelocity_Native", Hazel::Script::Hazel_RigidBody2DComponent_GetLinearVelocity);
mono_add_internal_call("Hazel.RigidBody2DComponent::SetLinearVelocity_Native", Hazel::Script::Hazel_RigidBody2DComponent_SetLinearVelocity);
mono_add_internal_call("Hazel.RigidBody2DComponent::ApplyLinearImpulse_Native", (const void*)Hazel::Script::Hazel_RigidBody2DComponent_ApplyLinearImpulse);
mono_add_internal_call("Hazel.RigidBody2DComponent::GetLinearVelocity_Native", (const void*)Hazel::Script::Hazel_RigidBody2DComponent_GetLinearVelocity);
mono_add_internal_call("Hazel.RigidBody2DComponent::SetLinearVelocity_Native", (const void*)Hazel::Script::Hazel_RigidBody2DComponent_SetLinearVelocity);

mono_add_internal_call("Hazel.Input::IsKeyPressed_Native", Hazel::Script::Hazel_Input_IsKeyPressed);
mono_add_internal_call("Hazel.Input::IsKeyPressed_Native", (const void*)Hazel::Script::Hazel_Input_IsKeyPressed);

mono_add_internal_call("Hazel.Texture2D::Constructor_Native", Hazel::Script::Hazel_Texture2D_Constructor);
mono_add_internal_call("Hazel.Texture2D::Destructor_Native", Hazel::Script::Hazel_Texture2D_Destructor);
mono_add_internal_call("Hazel.Texture2D::SetData_Native", Hazel::Script::Hazel_Texture2D_SetData);
mono_add_internal_call("Hazel.Texture2D::Constructor_Native", (const void*)Hazel::Script::Hazel_Texture2D_Constructor);
mono_add_internal_call("Hazel.Texture2D::Destructor_Native", (const void*)Hazel::Script::Hazel_Texture2D_Destructor);
mono_add_internal_call("Hazel.Texture2D::SetData_Native", (const void*)Hazel::Script::Hazel_Texture2D_SetData);

mono_add_internal_call("Hazel.Material::Destructor_Native", Hazel::Script::Hazel_Material_Destructor);
mono_add_internal_call("Hazel.Material::SetFloat_Native", Hazel::Script::Hazel_Material_SetFloat);
mono_add_internal_call("Hazel.Material::SetTexture_Native", Hazel::Script::Hazel_Material_SetTexture);
mono_add_internal_call("Hazel.Material::Destructor_Native", (const void*)Hazel::Script::Hazel_Material_Destructor);
mono_add_internal_call("Hazel.Material::SetFloat_Native", (const void*)Hazel::Script::Hazel_Material_SetFloat);
mono_add_internal_call("Hazel.Material::SetTexture_Native", (const void*)Hazel::Script::Hazel_Material_SetTexture);

mono_add_internal_call("Hazel.MaterialInstance::Destructor_Native", Hazel::Script::Hazel_MaterialInstance_Destructor);
mono_add_internal_call("Hazel.MaterialInstance::SetFloat_Native", Hazel::Script::Hazel_MaterialInstance_SetFloat);
mono_add_internal_call("Hazel.MaterialInstance::SetVector3_Native", Hazel::Script::Hazel_MaterialInstance_SetVector3);
mono_add_internal_call("Hazel.MaterialInstance::SetVector4_Native", Hazel::Script::Hazel_MaterialInstance_SetVector4);
mono_add_internal_call("Hazel.MaterialInstance::SetTexture_Native", Hazel::Script::Hazel_MaterialInstance_SetTexture);
mono_add_internal_call("Hazel.MaterialInstance::Destructor_Native", (const void*)Hazel::Script::Hazel_MaterialInstance_Destructor);
mono_add_internal_call("Hazel.MaterialInstance::SetFloat_Native", (const void*)Hazel::Script::Hazel_MaterialInstance_SetFloat);
mono_add_internal_call("Hazel.MaterialInstance::SetVector3_Native", (const void*)Hazel::Script::Hazel_MaterialInstance_SetVector3);
mono_add_internal_call("Hazel.MaterialInstance::SetVector4_Native", (const void*)Hazel::Script::Hazel_MaterialInstance_SetVector4);
mono_add_internal_call("Hazel.MaterialInstance::SetTexture_Native", (const void*)Hazel::Script::Hazel_MaterialInstance_SetTexture);

mono_add_internal_call("Hazel.Mesh::Constructor_Native", Hazel::Script::Hazel_Mesh_Constructor);
mono_add_internal_call("Hazel.Mesh::Destructor_Native", Hazel::Script::Hazel_Mesh_Destructor);
mono_add_internal_call("Hazel.Mesh::GetMaterial_Native", Hazel::Script::Hazel_Mesh_GetMaterial);
mono_add_internal_call("Hazel.Mesh::GetMaterialByIndex_Native", Hazel::Script::Hazel_Mesh_GetMaterialByIndex);
mono_add_internal_call("Hazel.Mesh::GetMaterialCount_Native", Hazel::Script::Hazel_Mesh_GetMaterialCount);
mono_add_internal_call("Hazel.Mesh::Constructor_Native", (const void*)Hazel::Script::Hazel_Mesh_Constructor);
mono_add_internal_call("Hazel.Mesh::Destructor_Native", (const void*)Hazel::Script::Hazel_Mesh_Destructor);
mono_add_internal_call("Hazel.Mesh::GetMaterial_Native", (const void*)Hazel::Script::Hazel_Mesh_GetMaterial);
mono_add_internal_call("Hazel.Mesh::GetMaterialByIndex_Native", (const void*)Hazel::Script::Hazel_Mesh_GetMaterialByIndex);
mono_add_internal_call("Hazel.Mesh::GetMaterialCount_Native", (const void*)Hazel::Script::Hazel_Mesh_GetMaterialCount);

mono_add_internal_call("Hazel.MeshFactory::CreatePlane_Native", Hazel::Script::Hazel_MeshFactory_CreatePlane);
mono_add_internal_call("Hazel.MeshFactory::CreatePlane_Native", (const void*)Hazel::Script::Hazel_MeshFactory_CreatePlane);

// static bool IsKeyPressed(KeyCode key) { return s_Instance->IsKeyPressedImpl(key); }
//
Expand Down
14 changes: 9 additions & 5 deletions MoravaEngine/src/ImGui/ImGuiWrapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ void ImGuiWrapper::DrawMaterialUI(Hazel::Ref<EnvMapMaterial> material, Hazel::Re
ImGui::Text(material->GetUUID().c_str());
ImGui::Columns(1);

auto& materialName = material->GetName();
auto materialName = material->GetName();

char buffer[256];
memset(buffer, 0, 256);
Expand Down Expand Up @@ -702,7 +702,8 @@ bool ImGuiWrapper::Property(const char* label, const char* value)
s_IDBuffer[0] = '#';
s_IDBuffer[1] = '#';
memset(s_IDBuffer + 2, 0, 14);
_itoa_s(s_Counter++, s_IDBuffer + 2, 16, 16);
// _itoa_s(s_Counter++, s_IDBuffer + 2, 16, 16);
sprintf(s_IDBuffer + 2, "%d", s_Counter++);
modified = ImGui::InputText(s_IDBuffer, (char*)value, 256, ImGuiInputTextFlags_ReadOnly);

ImGui::PopItemWidth();
Expand All @@ -722,7 +723,8 @@ bool ImGuiWrapper::Property(const char* label, int& value)
s_IDBuffer[0] = '#';
s_IDBuffer[1] = '#';
memset(s_IDBuffer + 2, 0, 14);
_itoa_s(s_Counter++, s_IDBuffer + 2, 16, 16);
// _itoa_s(s_Counter++, s_IDBuffer + 2, 16, 16);
sprintf(s_IDBuffer + 2, "%d", s_Counter++);
if (ImGui::DragInt(s_IDBuffer, &value)) {
modified = true;
}
Expand All @@ -744,7 +746,8 @@ bool ImGuiWrapper::Property(const char* label, float& value, float delta)
s_IDBuffer[0] = '#';
s_IDBuffer[1] = '#';
memset(s_IDBuffer + 2, 0, 14);
_itoa_s(s_Counter++, s_IDBuffer + 2, 16, 16);
// _itoa_s(s_Counter++, s_IDBuffer + 2, 16, 16);
sprintf(s_IDBuffer + 2, "%d", s_Counter++);
if (ImGui::DragFloat(s_IDBuffer, &value, delta)) {
modified = true;
}
Expand All @@ -766,7 +769,8 @@ bool ImGuiWrapper::Property(const char* label, glm::vec2& value, float delta)
s_IDBuffer[0] = '#';
s_IDBuffer[1] = '#';
memset(s_IDBuffer + 2, 0, 14);
_itoa_s(s_Counter++, s_IDBuffer + 2, 16, 16);
// _itoa_s(s_Counter++, s_IDBuffer + 2, 16, 16);
sprintf(s_IDBuffer + 2, "%d", s_Counter++);
if (ImGui::DragFloat2(s_IDBuffer, glm::value_ptr(value), delta)) {
modified = true;
}
Expand Down
2 changes: 1 addition & 1 deletion MoravaEngine/src/Particle/Particle.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void Particle::UpdateTextureCoordInfo()
float atlasProgression = lifeFactor * stageCount;
int index1 = (int)floor(atlasProgression);
int index2 = index1 < stageCount - 1 ? index1 + 1 : index1;
float integerPart;
double integerPart;
m_Blend = (float)modf(atlasProgression, &integerPart);
SetTextureOffset(&m_TexOffset1, index1);
SetTextureOffset(&m_TexOffset2, index2);
Expand Down
2 changes: 1 addition & 1 deletion MoravaEngine/src/Particle/ParticleSystemThinMatrix.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ void ParticleSystemThinMatrix::GenerateParticles(glm::vec3 position, glm::vec3 s
float delta = Timer::Get()->GetDeltaTime();
float particlesToCreate = m_PPS * delta;
int count = (int)std::floor(particlesToCreate);
float integerPart;
double integerPart;
float partialParticle = (float)modf(particlesToCreate, &integerPart);

for (int i = 0; i < count; i++) {
Expand Down
14 changes: 7 additions & 7 deletions MoravaEngine/src/Scene/SceneAnimPBR.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ void SceneAnimPBR::SetupMeshes()
m_Entities["Cube"].Transform.Transform = glm::translate(m_Entities["Cube"].Transform.Transform, m_Entities["Cube"].Transform.Translation);
m_Entities["Cube"].Transform.Transform = glm::scale(m_Entities["Cube"].Transform.Transform, m_Entities["Cube"].Transform.Scale);

m_Entities["Cube"].AABB = AABB(m_Entities["Cube"].Transform.Translation + m_Entities["Cube"].OriginOffset,
m_Entities["Cube"].AABBox = AABB(m_Entities["Cube"].Transform.Translation + m_Entities["Cube"].OriginOffset,
m_Entities["Cube"].Transform.Rotation, m_Entities["Cube"].Init.AABB.Transform.Scale);

Log::GetLogger()->info("-- END loading the Cube mesh --");
Expand All @@ -295,7 +295,7 @@ void SceneAnimPBR::SetupMeshes()
m_Entities["M1911"].Transform.Transform = glm::translate(m_Entities["M1911"].Transform.Transform, m_Entities["M1911"].Transform.Translation);
m_Entities["M1911"].Transform.Transform = glm::scale(m_Entities["M1911"].Transform.Transform, m_Entities["M1911"].Transform.Scale);

m_Entities["M1911"].AABB = AABB(m_Entities["M1911"].Transform.Translation + m_Entities["M1911"].OriginOffset,
m_Entities["M1911"].AABBox = AABB(m_Entities["M1911"].Transform.Translation + m_Entities["M1911"].OriginOffset,
m_Entities["M1911"].Transform.Rotation, m_Entities["M1911"].Init.AABB.Transform.Scale);

Log::GetLogger()->info("-- END loading the animated PBR model M1911 --");
Expand All @@ -320,7 +320,7 @@ void SceneAnimPBR::SetupMeshes()
m_Entities["BobLamp"].Transform.Transform = glm::translate(m_Entities["BobLamp"].Transform.Transform, m_Entities["BobLamp"].Transform.Translation);
m_Entities["BobLamp"].Transform.Transform = glm::scale(m_Entities["BobLamp"].Transform.Transform, m_Entities["BobLamp"].Transform.Scale);

m_Entities["BobLamp"].AABB = AABB(m_Entities["BobLamp"].Transform.Translation + m_Entities["BobLamp"].OriginOffset,
m_Entities["BobLamp"].AABBox = AABB(m_Entities["BobLamp"].Transform.Translation + m_Entities["BobLamp"].OriginOffset,
m_Entities["BobLamp"].Transform.Rotation, m_Entities["BobLamp"].Init.AABB.Transform.Scale);

Log::GetLogger()->info("-- END loading the animated PBR model BobLamp --");
Expand All @@ -345,7 +345,7 @@ void SceneAnimPBR::SetupMeshes()
m_Entities["AnimBoy"].Transform.Transform = glm::translate(m_Entities["AnimBoy"].Transform.Transform, m_Entities["AnimBoy"].Transform.Translation);
m_Entities["AnimBoy"].Transform.Transform = glm::scale(m_Entities["AnimBoy"].Transform.Transform, m_Entities["AnimBoy"].Transform.Scale);

m_Entities["AnimBoy"].AABB = AABB(m_Entities["AnimBoy"].Transform.Translation + m_Entities["AnimBoy"].OriginOffset,
m_Entities["AnimBoy"].AABBox = AABB(m_Entities["AnimBoy"].Transform.Translation + m_Entities["AnimBoy"].OriginOffset,
m_Entities["AnimBoy"].Transform.Rotation, m_Entities["AnimBoy"].Init.AABB.Transform.Scale);

Log::GetLogger()->info("-- END loading the animated PBR model Animated Boy --");
Expand All @@ -372,7 +372,7 @@ void SceneAnimPBR::Update(float timestep, Window* mainWindow)
entity.second.Transform.Rotation = rotation;
entity.second.Transform.Scale = scale;

entity.second.AABB.Update(entity.second.Transform.Translation, entity.second.Transform.Rotation, entity.second.Transform.Scale);
entity.second.AABBox.Update(entity.second.Transform.Translation, entity.second.Transform.Rotation, entity.second.Transform.Scale);
}

CheckIntersection(mainWindow);
Expand Down Expand Up @@ -446,7 +446,7 @@ void SceneAnimPBR::CheckIntersection(Window* mainWindow)
{
entity.second.Intersecting = entity.second.Enabled &&
AABB::IntersectRayAab(m_Camera->GetPosition(), MousePicker::Get()->GetCurrentRay(),
entity.second.AABB.GetMin(), entity.second.AABB.GetMax(), glm::vec2(0.0f));
entity.second.AABBox.GetMin(), entity.second.AABBox.GetMax(), glm::vec2(0.0f));
}

if (mainWindow->IsMouseButtonClicked((int)Mouse::ButtonLeft))
Expand Down Expand Up @@ -1094,7 +1094,7 @@ void SceneAnimPBR::Render(Window* mainWindow, glm::mat4 projectionMatrix, std::s
{
m_ShaderBasic->setMat4("model", AABB_Transform);
m_ShaderBasic->setVec4("tintColor", glm::vec4(0.0f, 1.0f, 1.0f, 1.0f));
if (m_VisibleAABBs) entity.second.AABB.Draw();
if (m_VisibleAABBs) entity.second.AABBox.Draw();
}
}

Expand Down
2 changes: 1 addition & 1 deletion MoravaEngine/src/Scene/SceneAnimPBR.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ class SceneAnimPBR : public Scene
glm::mat4 Transform;
} AABBTransform;

AABB AABB;
AABB AABBox;
glm::vec3 OriginOffset;
bool Intersecting;
bool Enabled;
Expand Down
2 changes: 2 additions & 0 deletions MoravaEngine/src/Texture/Texture.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include "Texture/Texture.h"

#include "Core/Log.h"
#include "Hazel/Core/Base.h"

#include <fstream>
#include <exception>
Expand Down Expand Up @@ -327,3 +328,4 @@ Texture::~Texture()
{
Clear();
}

0 comments on commit 8d1c785

Please sign in to comment.