Skip to content

Depend on destiny for IEveBallpark.h,IEveReferencePoint.h #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ccptoebeans wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Depend on destiny for IEveBallpark.h,IEveReferencePoint.h #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d3de577
Depend on destiny for IEveBallpark.h,IEveReferencePoint.h
ccptoebeans Sep 11, 2026
5eedd5d
Account for destiny cmake target name being different across monolith…
ccptoebeans Sep 11, 2026
b099a2a
Replace "" with <> for what are now external includes
ccptoebeans Sep 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions trinity/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
$<TARGET_PROPERTY:PNG::PNG,INTERFACE_INCLUDE_DIRECTORIES>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
$<TARGET_PROPERTY:PNG::PNG,INTERFACE_INCLUDE_DIRECTORIES>
$<BUILD_INTERFACE:${DESTINY_INCLUDE_DIRS}>
PRIVATE
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/..
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/EveSpaceScene.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@


#include "include/ITr2Scene.h"
#include "include/IEveBallpark.h"
#include "TriFrustum.h"
#include "SpaceObject/EveSpaceObject2.h"
#include "TriRenderBatch.h"
Expand All @@ -30,6 +29,7 @@
#include "EvePicking.h"

#include <ITriFunction.h>
#include <IEveBallpark.h>

class TriProjection;
class TriView;
Expand Down
3 changes: 1 addition & 2 deletions trinity/Eve/EveSpaceScene_Blue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
#include "StdAfx.h"
#include "EveSpaceScene.h"

#include "include/IEveBallpark.h"

#include "TriProjection.h"
#include "TriPythonContext.h"
#include "TriView.h"
Expand All @@ -13,6 +11,7 @@
#include "TriDevice.h"
#include "Shader/Tr2ShaderBuffer.h"
#include "Particle/Tr2GpuParticleSystem.h"
#include <IEveBallpark.h>

BLUE_DEFINE( EveSpaceScene );
BLUE_DEFINE_INTERFACE( IEveReferencePoint );
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/EveUpdateContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
#pragma once
#ifndef EveUpdateContext_h
#define EveUpdateContext_h
#include "Include/IEveBallpark.h"
#include "Utilities/Vector3d.h"
#include "../TbbStub.h"
#include <TriFrustum.h>
#include <IEveBallpark.h>

BLUE_DECLARE( Tr2DataTextureManager );

Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/SpaceObject/EveMissile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "EveMissile.h"
#include "EveMissileWarhead.h"
#include "Eve/EveUpdateContext.h"
#include "include/IEveReferencePoint.h"
#include <IEveReferencePoint.h>

// keep track of missiles
CCP_STATS_DECLARE( eveMissileObjects, "Trinity/Missiles/missileObjects", true, CST_COUNTER_LOW, "Number of missiles (MIRVs) in this frame." );
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/SpaceObject/EveSpaceObject2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -40,6 +39,7 @@
#include "../../Tr2RingBuffer.h"

#include <limits>
#include <IEveBallpark.h>


std::atomic<uint64_t> EveSpaceObject2::s_nextAudioInstanceId{ 1 };
Expand Down
31 changes: 0 additions & 31 deletions trinity/Include/IEveBallpark.h
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions trinity/Include/IEveReferencePoint.h
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down