sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

This commit is contained in:
SirLynix 2023-06-16 13:06:11 +02:00
parent 6bf91e10e5
commit 2a9ec4f3bb
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core.hpp
View File

@ -82,12 +82,14 @@
#include <Nazara/Core/ResourceRegistry.hpp> #include <Nazara/Core/ResourceRegistry.hpp>
#include <Nazara/Core/ResourceSaver.hpp> #include <Nazara/Core/ResourceSaver.hpp>
#include <Nazara/Core/SerializationContext.hpp> #include <Nazara/Core/SerializationContext.hpp>
#include <Nazara/Core/SignalHandlerAppComponent.hpp>
#include <Nazara/Core/State.hpp> #include <Nazara/Core/State.hpp>
#include <Nazara/Core/StateMachine.hpp> #include <Nazara/Core/StateMachine.hpp>
#include <Nazara/Core/StdLogger.hpp> #include <Nazara/Core/StdLogger.hpp>
#include <Nazara/Core/Stream.hpp> #include <Nazara/Core/Stream.hpp>
#include <Nazara/Core/StringExt.hpp> #include <Nazara/Core/StringExt.hpp>
#include <Nazara/Core/TaskScheduler.hpp> #include <Nazara/Core/TaskScheduler.hpp>
#include <Nazara/Core/ThreadExt.hpp>
#include <Nazara/Core/Time.hpp> #include <Nazara/Core/Time.hpp>
#include <Nazara/Core/Unicode.hpp> #include <Nazara/Core/Unicode.hpp>
#include <Nazara/Core/Updatable.hpp> #include <Nazara/Core/Updatable.hpp>

2
include/Nazara/Math/BoundingVolume.inl
View File

@ -94,7 +94,7 @@ namespace Nz
if (extent != Extent::Finite) if (extent != Extent::Finite)
return true; return true;
return aabb.ApproxEqual(volume.aabb) && obb.ApproxEqual(volume.obb); return aabb.ApproxEqual(volume.aabb, maxDifference) && obb.ApproxEqual(volume.obb, maxDifference);
} }
/*! /*!

3
src/Nazara/JoltPhysics3D/JoltRigidBody3D.cpp
View File

@ -247,7 +247,7 @@ namespace Nz
} }
JPH::BodyInterface& bodyInterface = m_world->GetPhysicsSystem()->GetBodyInterface(); JPH::BodyInterface& bodyInterface = m_world->GetPhysicsSystem()->GetBodyInterface();
bodyInterface.SetShape(m_body->GetID(), m_geom->GetShapeSettings()->Create().Get(), false, (ShouldActivate()) ? JPH::EActivation::Activate : JPH::EActivation::DontActivate); bodyInterface.SetShape(m_body->GetID(), shape, false, (ShouldActivate()) ? JPH::EActivation::Activate : JPH::EActivation::DontActivate);
if (recomputeInertia) if (recomputeInertia)
{ {
JPH::MassProperties massProperties = m_body->GetShape()->GetMassProperties(); JPH::MassProperties massProperties = m_body->GetShape()->GetMassProperties();
@ -361,7 +361,6 @@ namespace Nz
{ {
if (m_body) if (m_body)
{ {
JPH::BodyInterface& bodyInterface = m_world->GetPhysicsSystem()->GetBodyInterface();
m_world->UnregisterBody(m_body->GetID(), true, !worldDestruction); m_world->UnregisterBody(m_body->GetID(), true, !worldDestruction);
m_body = nullptr; m_body = nullptr;
} }

2
src/ShaderNode/ShaderGraph.cpp
View File

@ -705,7 +705,7 @@ nzsl::Ast::ExpressionType ShaderGraph::ToShaderExpressionType(TextureType type)
{ {
switch (type) switch (type)
{ {
case TextureType::Sampler2D: return nzsl::Ast::SamplerType{ nzsl::ImageType::E2D, nzsl::Ast::PrimitiveType::Float32 }; case TextureType::Sampler2D: return nzsl::Ast::SamplerType{ nzsl::ImageType::E2D, nzsl::Ast::PrimitiveType::Float32, false };
} }
assert(false); assert(false);

6
xmake.lua
View File

@ -369,10 +369,8 @@ set_warnings("allextra")
if is_mode("debug") then if is_mode("debug") then
add_rules("debug.suffix") add_rules("debug.suffix")
add_defines("NAZARA_DEBUG") add_defines("NAZARA_DEBUG")
elseif is_mode("asan") then elseif is_mode("asan", "tsan") then
set_optimize("none") -- by default xmake will optimize asan builds set_optimize("none") -- by default xmake will optimize asan/tsan builds
elseif is_mode("tsan") then
set_optimize("none") -- by default xmake will optimize asan builds
elseif is_mode("coverage") then elseif is_mode("coverage") then
if not is_plat("windows") then if not is_plat("windows") then
add_links("gcov") add_links("gcov")