diff --git a/.teamcity/Windows/Project.kt b/.teamcity/Windows/Project.kt index 0d4042fcf..2630305d4 100644 --- a/.teamcity/Windows/Project.kt +++ b/.teamcity/Windows/Project.kt @@ -38,7 +38,7 @@ object Project : Project({ }) -class CarbonBuildWindows(buildName: String, configType: String, preset: String) : BuildType({ +class CarbonBuildWindows(buildName: String, configType: String, preset: String, vsDevBatSwitches: String = "-arch=x64 -vcvars_ver=14.51") : BuildType({ id(buildName.toId()) this.name = buildName @@ -48,9 +48,7 @@ class CarbonBuildWindows(buildName: String, configType: String, preset: String) param("env.GIT_TAG_HASH_OVERRIDE", "") param("github_checkout_folder", "github") param("env.CTEST_JUNIT_OUTPUT_FILE", "ctest_results.xml") - select("env.VISUAL_STUDIO_PLATFORM_TOOLSET", "v141", label = "Visual Studio Platform Toolset", description = "Specify the toolset for the build. e.g. v141 or v143.", - options = listOf("v141 (2017)" to "v141", "v143 (2022)" to "v143")) - param("VS_DEV_BAT_SWITCHES", "-arch=x64") + param("VS_DEV_BAT_SWITCHES", vsDevBatSwitches) param("env.VSDEV_BAT_PATH", "%%ProgramFiles(x86)%%/Microsoft Visual Studio/2017/BuildTools/Common7/Tools/vsdevcmd.bat") param("env.CMAKE_BUILD_TARGETS", "all") param("env.CMAKE_INSTALL_PREFIX", ".build-artifact") diff --git a/CMakePresets.json b/CMakePresets.json index e9bdc07fd..e69aa287c 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -44,7 +44,7 @@ "name": "x64-windows", "inherits": "windows", "cacheVariables": { - "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-carbon.cmake" + "VCPKG_CHAINLOAD_TOOLCHAIN_FILE": "${sourceDir}/vendor/github.com/carbonengine/vcpkg-registry/toolchains/x64-windows-145-carbon.cmake" }, "hidden": true }, @@ -71,8 +71,8 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Internal", - "VCPKG_TARGET_TRIPLET": "x64-windows-internal", - "VCPKG_HOST_TRIPLET": "x64-windows-internal" + "VCPKG_TARGET_TRIPLET": "x64-windows-145-internal", + "VCPKG_HOST_TRIPLET": "x64-windows-145-internal" } }, { @@ -80,8 +80,8 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Release", - "VCPKG_TARGET_TRIPLET": "x64-windows-release", - "VCPKG_HOST_TRIPLET": "x64-windows-release" + "VCPKG_TARGET_TRIPLET": "x64-windows-145-release", + "VCPKG_HOST_TRIPLET": "x64-windows-145-release" } }, { @@ -89,8 +89,8 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "Debug", - "VCPKG_TARGET_TRIPLET": "x64-windows-debug", - "VCPKG_HOST_TRIPLET": "x64-windows-debug" + "VCPKG_TARGET_TRIPLET": "x64-windows-145-debug", + "VCPKG_HOST_TRIPLET": "x64-windows-145-debug" } }, { @@ -98,8 +98,8 @@ "inherits": "x64-windows", "cacheVariables": { "CMAKE_BUILD_TYPE": "TrinityDev", - "VCPKG_TARGET_TRIPLET": "x64-windows-trinitydev", - "VCPKG_HOST_TRIPLET": "x64-windows-trinitydev" + "VCPKG_TARGET_TRIPLET": "x64-windows-145-trinitydev", + "VCPKG_HOST_TRIPLET": "x64-windows-145-trinitydev" } }, { diff --git a/trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp b/trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp index ba6334b74..652442526 100644 --- a/trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp +++ b/trinity/Eve/SpaceObject/Children/EveChildCloud2.cpp @@ -577,7 +577,7 @@ void EveChildCloud2::PopulatePerObjectData( PerObjectData& data, float screenSiz if( radius > 0 ) { data.lights[i].innerRadius = std::max( std::min( light->GetLightData().innerRadius / radius, 1.f ), 0.f ); - data.lights[i].color = ( Vector4( color ) * light->GetBrightnessMultiplier() ).GetXYZ() * pow( data.lights[i].innerRadius * 2 + 1, 3 ); + data.lights[i].color = ( Vector4( color ) * light->GetBrightnessMultiplier() ).GetXYZ() * pow( data.lights[i].innerRadius * 2 + 1, 3.f ); } else { diff --git a/trinity/Eve/SpaceObject/EveMissileWarhead.cpp b/trinity/Eve/SpaceObject/EveMissileWarhead.cpp index 542626a8b..f686ea291 100644 --- a/trinity/Eve/SpaceObject/EveMissileWarhead.cpp +++ b/trinity/Eve/SpaceObject/EveMissileWarhead.cpp @@ -553,7 +553,7 @@ void EveMissileWarhead::UpdateWarhead( float deltaT, float estimatedTotalAliveTi // override some behaviour for bombs if( m_bombFlightpath ) { - const float bombTrackBall = pow( 1.f - quickFlight01, 2 ); + const float bombTrackBall = pow( 1.f - quickFlight01, 2.f ); m_currentOffset *= bombTrackBall; } diff --git a/trinity/Tr2DepthStencil.cpp b/trinity/Tr2DepthStencil.cpp index 5f5e135ec..00920e313 100644 --- a/trinity/Tr2DepthStencil.cpp +++ b/trinity/Tr2DepthStencil.cpp @@ -46,7 +46,7 @@ void Tr2DepthStencil::py__init__( } } -long Tr2DepthStencil::Create( unsigned width, unsigned height, DepthStencilFormat dsFormat, unsigned msaaType, unsigned msaaQuality, Tr2RenderContextEnum::ExFlag flags ) +int32_t Tr2DepthStencil::Create( unsigned width, unsigned height, DepthStencilFormat dsFormat, unsigned msaaType, unsigned msaaQuality, Tr2RenderContextEnum::ExFlag flags ) { USE_MAIN_THREAD_RENDER_CONTEXT(); auto gpuUsage = Tr2GpuUsage::DEPTH_STENCIL | Tr2GpuUsage::SHADER_RESOURCE; diff --git a/trinity/Tr2DepthStencil.h b/trinity/Tr2DepthStencil.h index 3ad0d56b4..ddaeac80c 100644 --- a/trinity/Tr2DepthStencil.h +++ b/trinity/Tr2DepthStencil.h @@ -37,7 +37,7 @@ BLUE_CLASS( Tr2DepthStencil ) : Be::OptionalWithDefaultValue msaaQuality, Be::OptionalWithDefaultValue flags ); - long Create( + int32_t Create( unsigned width, unsigned height, Tr2RenderContextEnum::DepthStencilFormat format, diff --git a/trinity/Tr2RenderTarget.cpp b/trinity/Tr2RenderTarget.cpp index d1d6e9942..d3422a544 100644 --- a/trinity/Tr2RenderTarget.cpp +++ b/trinity/Tr2RenderTarget.cpp @@ -357,14 +357,14 @@ bool Tr2RenderTarget::IsReadable() const return GetRenderTarget().IsValid() && Tr2GpuUsage::HasFlag( GetRenderTarget().GetGpuUsage(), Tr2GpuUsage::SHADER_RESOURCE ); } -long Tr2RenderTarget::GenerateMipMaps() +int32_t Tr2RenderTarget::GenerateMipMaps() { CCP_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); return GetRenderTarget().GenerateMipMaps( renderContext ).GetResult(); } -long Tr2RenderTarget::Resolve( Tr2RenderTarget* destination ) +int32_t Tr2RenderTarget::Resolve( Tr2RenderTarget* destination ) { CCP_STATS_ZONE( __FUNCTION__ ); USE_MAIN_THREAD_RENDER_CONTEXT(); diff --git a/trinity/Tr2RenderTarget.h b/trinity/Tr2RenderTarget.h index 1a9280fbf..90967dfce 100644 --- a/trinity/Tr2RenderTarget.h +++ b/trinity/Tr2RenderTarget.h @@ -86,8 +86,8 @@ BLUE_CLASS( Tr2RenderTarget ) : Tr2RenderContextEnum::PixelFormat GetFormat() const; Tr2RenderContextEnum::TextureType GetType() const; - long GenerateMipMaps(); - long Resolve( Tr2RenderTarget * destination ); + int32_t GenerateMipMaps(); + int32_t Resolve( Tr2RenderTarget * destination ); Tr2TextureAL& GetRenderTarget(); const Tr2TextureAL& GetRenderTarget() const;