diff --git a/trinity/CMakeLists.txt b/trinity/CMakeLists.txt index 74327c8a8..a2bbcf8b3 100644 --- a/trinity/CMakeLists.txt +++ b/trinity/CMakeLists.txt @@ -21,6 +21,7 @@ if(BUILD_FOR_PYTHON_2) add_library(GPUOpen::VulkanMemoryAllocator ALIAS GPUOpen::VMA) find_package(CarbonTrinityAudioAPI REQUIRED) add_library(CcpTrinityAudioAPI ALIAS CarbonTrinityAudioAPI) + find_package(Destiny) else() find_package(unofficial-libsquish CONFIG REQUIRED) find_package(amd-fidelityfx-cas CONFIG REQUIRED) @@ -29,11 +30,10 @@ else() find_package(VulkanHeaders CONFIG) # Required for VulkanMemoryAllocator find_package(VulkanMemoryAllocator CONFIG REQUIRED) find_package(carbon-trinityaudioapi CONFIG REQUIRED) + find_package(carbon-destiny CONFIG REQUIRED) endif() set(PUBLIC_HEADER_FILES - Include/IEveBallpark.h - Include/IEveReferencePoint.h Include/ITr2AnimationUpdater.h Include/ITr2BoundingBox.h Include/ITr2DebugRenderer.h @@ -855,8 +855,6 @@ set(_SOURCES Font/Tr2SBit.cpp Font/Tr2SBit.h Font/Tr2SBit_Blue.cpp - Include/IEveBallpark.h - Include/IEveReferencePoint.h Include/ITr2AnimationUpdater.h Include/ITr2BoundingBox.h Include/ITr2DebugRenderer.h @@ -1901,13 +1899,18 @@ function(set_shared_trinity_properties target) endif() target_precompile_headers(${target} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/StdAfx.h) - + set(destiny_target_name destiny) + if (BUILD_FOR_PYTHON_2) + set(destiny_target_name Destiny) + endif () + get_target_property(DESTINY_INCLUDE_DIRS ${destiny_target_name} INTERFACE_INCLUDE_DIRECTORIES) target_include_directories(${target} PUBLIC $ $ $ $ + $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/.. diff --git a/trinity/Eve/EveSpaceScene.h b/trinity/Eve/EveSpaceScene.h index 5a9d88cec..9d9ff01d2 100644 --- a/trinity/Eve/EveSpaceScene.h +++ b/trinity/Eve/EveSpaceScene.h @@ -6,7 +6,6 @@ #include "include/ITr2Scene.h" -#include "include/IEveBallpark.h" #include "TriFrustum.h" #include "SpaceObject/EveSpaceObject2.h" #include "TriRenderBatch.h" @@ -30,6 +29,7 @@ #include "EvePicking.h" #include +#include class TriProjection; class TriView; diff --git a/trinity/Eve/EveSpaceScene_Blue.cpp b/trinity/Eve/EveSpaceScene_Blue.cpp index 0d8ccd9d3..64fed458f 100644 --- a/trinity/Eve/EveSpaceScene_Blue.cpp +++ b/trinity/Eve/EveSpaceScene_Blue.cpp @@ -3,8 +3,6 @@ #include "StdAfx.h" #include "EveSpaceScene.h" -#include "include/IEveBallpark.h" - #include "TriProjection.h" #include "TriPythonContext.h" #include "TriView.h" @@ -13,6 +11,7 @@ #include "TriDevice.h" #include "Shader/Tr2ShaderBuffer.h" #include "Particle/Tr2GpuParticleSystem.h" +#include BLUE_DEFINE( EveSpaceScene ); BLUE_DEFINE_INTERFACE( IEveReferencePoint ); diff --git a/trinity/Eve/EveUpdateContext.h b/trinity/Eve/EveUpdateContext.h index 86cd95e23..82362d027 100644 --- a/trinity/Eve/EveUpdateContext.h +++ b/trinity/Eve/EveUpdateContext.h @@ -3,10 +3,10 @@ #pragma once #ifndef EveUpdateContext_h #define EveUpdateContext_h -#include "Include/IEveBallpark.h" #include "Utilities/Vector3d.h" #include "../TbbStub.h" #include +#include BLUE_DECLARE( Tr2DataTextureManager ); diff --git a/trinity/Eve/SpaceObject/EveMissile.cpp b/trinity/Eve/SpaceObject/EveMissile.cpp index 67a227523..1abf9df9c 100644 --- a/trinity/Eve/SpaceObject/EveMissile.cpp +++ b/trinity/Eve/SpaceObject/EveMissile.cpp @@ -7,7 +7,7 @@ #include "EveMissile.h" #include "EveMissileWarhead.h" #include "Eve/EveUpdateContext.h" -#include "include/IEveReferencePoint.h" +#include // keep track of missiles CCP_STATS_DECLARE( eveMissileObjects, "Trinity/Missiles/missileObjects", true, CST_COUNTER_LOW, "Number of missiles (MIRVs) in this frame." ); diff --git a/trinity/Eve/SpaceObject/EveSpaceObject2.cpp b/trinity/Eve/SpaceObject/EveSpaceObject2.cpp index f31588f6d..e70cfddff 100644 --- a/trinity/Eve/SpaceObject/EveSpaceObject2.cpp +++ b/trinity/Eve/SpaceObject/EveSpaceObject2.cpp @@ -7,7 +7,6 @@ #include "Utilities/MatrixUtils.h" #include "include/ITr2DebugRenderer.h" -#include "include/IEveBallpark.h" #include "Include/TriMath.h" #include "Resources/TriGeometryRes.h" #include "TriFrustumOrtho.h" @@ -40,6 +39,7 @@ #include "../../Tr2RingBuffer.h" #include +#include std::atomic EveSpaceObject2::s_nextAudioInstanceId{ 1 }; diff --git a/trinity/Include/IEveBallpark.h b/trinity/Include/IEveBallpark.h deleted file mode 100644 index e552018c1..000000000 --- a/trinity/Include/IEveBallpark.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright © 2023 CCP ehf. - -#ifndef IEveBallpark_H -#define IEveBallpark_H - -#include "IEveReferencePoint.h" - -// Forward declarations. -// Can't include these in interfaces. -struct Vector3; -struct Vector3d; - -BLUE_INTERFACE( IEveBallpark ) : - IEveReferencePoint -{ - virtual void Delta( - Vector3 * ref, - Vector3 * refSmooth, - Be::Time time ) = 0; - - virtual void DeltaVel( - Vector3 * vel, - Be::Time time ) = 0; - - virtual float GetUnitBase() = 0; - - virtual void SetUnitBase( - float unit ) = 0; -}; - -#endif \ No newline at end of file diff --git a/trinity/Include/IEveReferencePoint.h b/trinity/Include/IEveReferencePoint.h deleted file mode 100644 index 3345625a1..000000000 --- a/trinity/Include/IEveReferencePoint.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright © 2023 CCP ehf. - -#ifndef IEveReferencePoint_H -#define IEveReferencePoint_H - -// Forward declaration. -// Can't include these in interfaces. -struct Vector3d; - -BLUE_INTERFACE( IEveReferencePoint ) : - IRoot -{ - virtual Vector3d* GetReferencePoint( Vector3d * out, Be::Time time ) = 0; -}; - -#endif diff --git a/vcpkg.json b/vcpkg.json index 46ac26106..972bb61aa 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -9,6 +9,10 @@ "name": "carbon-core", "version>=": "3.0.0" }, + { + "name": "carbon-destiny", + "version>=": "3.1.1#1" + }, { "name": "carbon-imageio", "version>=": "2.0.6#1"