Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion shadercompiler/DxReflection.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "ParserState.h"
#include "SymbolTable.h"
#include "CompileMessageQueue.h"
#include "FxAnalyzer.h"
#include "FXAnalyzer.h"
#include "HLSLParser.h"
#include "ParserUtils.h"
#include "ASTNode.h"
Expand Down
128 changes: 64 additions & 64 deletions trinity/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,43 +32,43 @@ else()
endif()

set(PUBLIC_HEADER_FILES
Include/IEveBallpark.h
Include/IEveReferencePoint.h
Include/ITr2AnimationUpdater.h
Include/ITr2BoundingBox.h
Include/ITr2DebugRenderer.h
Include/ITr2GpuBuffer.h
Include/ITr2InstanceData.h
Include/ITr2Interior.h
Include/ITr2MultiPassScene.h
Include/ITr2Scene.h
Include/ITr2Updateable.h
Include/ITr2ValueBinding.h
Include/ITriColor.h
Include/ITriDevice.h
Include/ITriDuration.h
Include/ITriEffectParameter.h
Include/ITriMatrix.h
Include/ITriQuaternion.h
Include/ITriTargetable.h
Include/ITriTextureRes.h
Include/ITriVector.h
Include/Point.h
Include/Rect.h
Include/Tr2Curve.h
Include/Tr2WindowHandle.h
Include/TriColor.h
Include/TriMath.h
Include/TriMath.h
Include/TriQuaternion.h
Include/TriVector.h
include/IEveBallpark.h
include/IEveReferencePoint.h
include/ITr2AnimationUpdater.h
include/ITr2BoundingBox.h
include/ITr2DebugRenderer.h
include/ITr2GpuBuffer.h
include/ITr2InstanceData.h
include/ITr2Interior.h
include/ITr2MultiPassScene.h
include/ITr2Scene.h
include/ITr2Updateable.h
include/ITr2ValueBinding.h
include/ITriColor.h
include/ITriDevice.h
include/ITriDuration.h
include/ITriEffectParameter.h
include/ITriMatrix.h
include/ITriQuaternion.h
include/ITriTargetable.h
include/ITriTextureRes.h
include/ITriVector.h
include/Point.h
include/Rect.h
include/Tr2Curve.h
include/Tr2WindowHandle.h
include/TriColor.h
include/TriMath.h
include/TriMath.h
include/TriQuaternion.h
include/TriVector.h
)

if(BUILD_FOR_PYTHON_2)
# This is only needed for py2 as the file now belongs in blue.
# Unfortunatly the blue py2 branch cannot be updated at present due to security vulnerability work.
# The file version in the older blue versions had diverged from this one is incompatible.
list(APPEND PUBLIC_HEADER_FILES Include/ITr2DebugRenderer2.h)
list(APPEND PUBLIC_HEADER_FILES include/ITr2DebugRenderer2.h)
endif()

set(_SOURCES
Expand Down Expand Up @@ -833,36 +833,36 @@ 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
Include/ITr2GpuBuffer.h
Include/ITr2InstanceData.h
Include/ITr2Interior.h
Include/ITr2MultiPassScene.h
Include/ITr2Scene.h
Include/ITr2Updateable.h
Include/ITr2ValueBinding.h
Include/ITriColor.h
Include/ITriDevice.h
Include/ITriDuration.h
Include/ITriEffectParameter.h
Include/ITriMatrix.h
Include/ITriQuaternion.h
Include/ITriTargetable.h
Include/ITriTextureRes.h
Include/ITriVector.h
Include/Point.h
Include/Rect.h
Include/Tr2Curve.h
Include/Tr2WindowHandle.h
Include/TriColor.h
Include/TriMath.h
Include/TriMath.h
Include/TriQuaternion.h
Include/TriVector.h
include/IEveBallpark.h
include/IEveReferencePoint.h
include/ITr2AnimationUpdater.h
include/ITr2BoundingBox.h
include/ITr2DebugRenderer.h
include/ITr2GpuBuffer.h
include/ITr2InstanceData.h
include/ITr2Interior.h
include/ITr2MultiPassScene.h
include/ITr2Scene.h
include/ITr2Updateable.h
include/ITr2ValueBinding.h
include/ITriColor.h
include/ITriDevice.h
include/ITriDuration.h
include/ITriEffectParameter.h
include/ITriMatrix.h
include/ITriQuaternion.h
include/ITriTargetable.h
include/ITriTextureRes.h
include/ITriVector.h
include/Point.h
include/Rect.h
include/Tr2Curve.h
include/Tr2WindowHandle.h
include/TriColor.h
include/TriMath.h
include/TriMath.h
include/TriQuaternion.h
include/TriVector.h
Interior/Tr2InteriorConstantBufferFormats.h
Interior/Tr2InteriorLightSet.cpp
Interior/Tr2InteriorLightSet.h
Expand Down Expand Up @@ -1789,7 +1789,7 @@ if(BUILD_FOR_PYTHON_2)
# This is only needed for py2 as the file now belongs in blue.
# Unfortunatly the blue py2 branch cannot be updated at present due to security vulnerability work.
# The file version in the older blue versions had diverged from this one is incompatible.
list(APPEND _SOURCES Include/ITr2DebugRenderer2.h)
list(APPEND _SOURCES include/ITr2DebugRenderer2.h)
endif()

set(GRANNY_RELATED_SOURCES
Expand Down Expand Up @@ -1955,7 +1955,7 @@ function(set_shared_trinity_properties target)
)

endif ()

ccp_enable_vs_analizers(${target})

if(${MSVC})
Expand Down Expand Up @@ -2089,7 +2089,7 @@ if (NOT INSTALL_TO_MONOLITH)

include(CMakePackageConfigHelpers)

configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/carbon-trinityConfig.cmake.in
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/carbon-trinityConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/carbon-trinityConfig.cmake
INSTALL_DESTINATION share/carbon-trinity)

Expand Down
2 changes: 1 addition & 1 deletion trinity/Controllers/Actions/Tr2ActionAnimateCurveSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#pragma once

#include "Include/ITr2Updateable.h"
#include "include/ITr2Updateable.h"
#include "ITr2ControllerAction.h"
#include "Controllers/Tr2ControllerExpression.h"

Expand Down
2 changes: 1 addition & 1 deletion trinity/Controllers/Actions/Tr2ActionAnimateValue.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#pragma once

#include "Include/ITr2Updateable.h"
#include "include/ITr2Updateable.h"
#include "ITr2ControllerAction.h"
#include "Controllers/Tr2BindingPoint.h"
#include "Controllers/Tr2ControllerExpression.h"
Expand Down
2 changes: 1 addition & 1 deletion trinity/Controllers/Actions/Tr2ActionBindRTPC.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#pragma once

#include "Include/ITr2Updateable.h"
#include "include/ITr2Updateable.h"
#include "ITr2ControllerAction.h"
#include "Controllers/Tr2ControllerExpression.h"

Expand Down
2 changes: 1 addition & 1 deletion trinity/Controllers/Actions/Tr2ActionPlayCurveSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include "ITr2ControllerAction.h"
#include "Include/ITr2Updateable.h"
#include "include/ITr2Updateable.h"


BLUE_CLASS( Tr2ActionPlayCurveSet ) :
Expand Down
2 changes: 1 addition & 1 deletion trinity/Controllers/Actions/Tr2ActionPython.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once

#include "ITr2ControllerAction.h"
#include "Include/ITr2Updateable.h"
#include "include/ITr2Updateable.h"


BLUE_CLASS( Tr2ActionPython ) :
Expand Down
2 changes: 1 addition & 1 deletion trinity/Controllers/Tr2Controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "Tr2StateMachine.h"
#include "Tr2ControllerFloatVariable.h"
#include "Tr2ControllerEventHandler.h"
#include "Include/ITr2Updateable.h"
#include "include/ITr2Updateable.h"
#include "../Tr2ExpressionTermInfo.h"
#include "ContinueOnMainThread.h"

Expand Down
2 changes: 1 addition & 1 deletion trinity/Controllers/Tr2TimelineController.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "Tr2TimelineController.h"
#include "Tr2ControllerFloatVariable.h"
#include "Tr2ControllerEventHandler.h"
#include "../Include/ITr2Updateable.h"
#include "../include/ITr2Updateable.h"
#include "../Tr2ExpressionTermInfo.h"
#include <ScopedBlockTrap.h>

Expand Down
2 changes: 1 addition & 1 deletion trinity/Curves/Tr2TranslationAdapter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "StdAfx.h"
#include "Tr2TranslationAdapter.h"
#include "Utilities/Vector3d.h"
#include "Include/TriMath.h"
#include "include/TriMath.h"


// --------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/AudioGameObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// This is only needed for py2 as the file now belongs in blue.
// Unfortunatly the blue py2 branch cannot be updated at present due to security vulnerability work.
// The file version in the older blue versions had diverged from this one is incompatible.
#include "Include/ITr2DebugRenderer2.h"
#include "include/ITr2DebugRenderer2.h"
#else
#include <ITr2DebugRenderer2.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/EveCamera.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "TriDevice.h"
#include "TriProjection.h"
#include "TriView.h"
#include "Include/TriMath.h"
#include "include/TriMath.h"
#include "Curves/Tr2CurveScalar.h"

static const float defFOV = TRI_PIBY2;
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/EveEffectRoot2.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#include "Eve/SpaceObject/Children/EveSpaceObjectChild.h"
#include "Eve/SpaceObject/Children/IEveEffectChildrenOwner.h"
#include "Tr2ShLightingManager.h"
#include "Include/ITriTargetable.h"
#include "include/ITriTargetable.h"
#include "Tr2DebugRenderer.h"
#include "ITr2CurveSetOwner.h"
#include "Shader/IShaderConfigurer.h"
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/EvePlanet.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// This is only needed for py2 as the file now belongs in blue.
// Unfortunatly the blue py2 branch cannot be updated at present due to security vulnerability work.
// The file version in the older blue versions had diverged from this one is incompatible.
#include "Include/ITr2DebugRenderer2.h"
#include "include/ITr2DebugRenderer2.h"
#else
#include <ITr2DebugRenderer2.h>
#endif
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/EveSpaceScene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "Tr2DepthStencil.h"
#include "EveTransform.h"
#include "TbbStub.h"
#include "Include/TriMath.h"
#include "include/TriMath.h"
#include "EveDistanceField.h"
#include "Renderable/EveSceneStaticParticles.h"
#include "Shader/Utils/Tr2DataTextureManager.h"
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/EveUpdateContext.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#pragma once
#ifndef EveUpdateContext_h
#define EveUpdateContext_h
#include "Include/IEveBallpark.h"
#include "include/IEveBallpark.h"
#include "Utilities/Vector3d.h"
#include "../TbbStub.h"
#include <TriFrustum.h>
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/Renderable/EveSceneStaticParticles.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include "StdAfx.h"
#include "EveSceneStaticParticles.h"

#include "Include/TriMath.h"
#include "include/TriMath.h"
#include "Utilities/BoundingSphere.h"
#include "Tr2RuntimeInstanceData.h"
#include "Tr2InstancedMesh.h"
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/Renderable/Stretch/EveStretch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include "EveStretch.h"
#include "TriFloat.h"
#include "Eve/EveUpdateContext.h"
#include "Include/TriMath.h"
#include "include/TriMath.h"
#include "Utilities/BoundingSphere.h"
#include "Eve/Turret/EveTurretSet.h"
#include "Curves/Tr2CurveScalar.h"
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/Renderable/Stretch/EveStretch3.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "EveStretch3.h"
#include "TriFloat.h"
#include "Eve/EveUpdateContext.h"
#include "Include/TriMath.h"
#include "include/TriMath.h"
#include "Utilities/BoundingSphere.h"
#include "Curves/TriCurveSet.h"
#include "Tr2DynamicBinding.h"
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/SpaceObject/Attachments/EveBoosterSet2.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "TriRenderBatch.h"
#include "TriFrustum.h"
#include "TriSettingsRegistrar.h"
#include "Include/TriMath.h"
#include "include/TriMath.h"
#include "Resources/TriGeometryRes.h"

#include "Eve/SpaceObject/Attachments/Sets/EveSpriteSet.h"
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/SpaceObject/Attachments/EveImpactOverlay.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

//#include "Eve/SpaceObject/EveSpaceObject2.h"
#include "ITr2Renderable.h"
#include "Include/ITriTargetable.h"
#include "include/ITriTargetable.h"
#include "Resources/Tr2LodResource.h"

class EveUpdateContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "EveSpriteLineSet.h"

#include "Include/TriMath.h"
#include "include/TriMath.h"
#include "Tr2QuadRenderer.h"
#include "Utilities/MatrixUtils.h"
#include "Shader/Tr2Effect.h"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Copyright © 2023 CCP ehf.

#include "StdAfx.h"
#include "followASpline.h"
#include "FollowASpline.h"
#include "Formation.h"

FollowASpline::FollowASpline( IRoot* lockobj ) :
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/SpaceObject/Children/Behaviors/Formation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "StdAfx.h"
#include "Formation.h"
#include "Include/TriMath.h"
#include "include/TriMath.h"


Formation::Formation( IRoot* lockobj ) :
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/SpaceObject/Children/Behaviors/Wander.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include "StdAfx.h"
#include "Wander.h"
#include "Include/TriMath.h"
#include "include/TriMath.h"
#include "include/TriQuaternion.h"

Wander::Wander( IRoot* lockobj ) :
Expand Down
2 changes: 1 addition & 1 deletion trinity/Eve/SpaceObject/Children/EveChildAudio.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
// This is only needed for py2 as the file now belongs in blue.
// Unfortunatly the blue py2 branch cannot be updated at present due to security vulnerability work.
// The file version in the older blue versions had diverged from this one is incompatible.
#include "Include/ITr2DebugRenderer2.h"
#include "include/ITr2DebugRenderer2.h"
#else
#include <ITr2DebugRenderer2.h>
#endif
Expand Down
Loading