AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-16 04:57:01 +00:00
Code Issues Projects Releases Wiki Activity

Windows compile fixes, and warning squash

Browse Source
This commit is contained in:
Phillip Stephens
2016-07-23 23:05:12 -07:00
parent 4b10697a5a
commit 76b88d0ad6
11 changed files with 48 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Runtime/Graphics/CBooRenderer.cpp
View File

@@ -1,3 +1,6 @@
#if _WIN32
#include <D3Dcommon.h>
#endif
#include "CBooRenderer.hpp"
namespace urde
@@ -182,6 +185,7 @@ void CBooRenderer::DrawString(const char*, int, int)
u32 CBooRenderer::GetFPS()
{
return 0;
}
void CBooRenderer::CacheReflection(TReflectionCallback, void*, bool)
@@ -232,6 +236,7 @@ void CBooRenderer::DoThermalBlendHot()
u32 CBooRenderer::GetStaticWorldDataSize()
{
return 0;
}
}

4
Runtime/Graphics/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
if(WIN32)
set(PLAT_SRCS Shaders/CLineRendererShadersHLSL.cpp Shaders/CModelShadersHLSL.cpp)
set(PLAT_SRCS Shaders/CLineRendererShadersHLSL.cpp Shaders/CModelShadersHLSL.cpp Shaders/CThermalColdFilterHLSL.cpp)
elseif(APPLE)
set(PLAT_SRCS Shaders/CLineRendererShadersMetal.cpp Shaders/CModelShadersMetal.cpp)
set(PLAT_SRCS Shaders/CLineRendererShadersMetal.cpp Shaders/CModelShadersMetal.cpp Shaders/CThermalColdFilterMetal.cpp)
endif()
set(GRAPHICS_SOURCES

2
Runtime/Graphics/Shaders/CLineRendererShadersHLSL.cpp
View File

@@ -1,5 +1,5 @@
#include "CLineRendererShaders.hpp"
#include "CLineRenderer.hpp"
#include "Graphics/CLineRenderer.hpp"
namespace urde
{

2
Runtime/Graphics/Shaders/CThermalColdFilterHLSL.cpp
View File

@@ -3,7 +3,7 @@
namespace urde
{
TFilterShader<CThermalColdFilter>::IDataBindingFactory* CThermalColdFilter::Initialize(boo::ID3DDataFactory::Context& ctx,
TShader<CThermalColdFilter>::IDataBindingFactory* CThermalColdFilter::Initialize(boo::ID3DDataFactory::Context& ctx,
boo::IShaderPipeline*& pipeOut,
boo::IVertexFormat*& vtxFmtOut)
{

2
Runtime/Graphics/Shaders/CThermalColdFilterMetal.cpp
View File

@@ -3,7 +3,7 @@
namespace urde
{
TFilterShader<CThermalColdFilter>::IDataBindingFactory* CThermalColdFilter::Initialize(boo::MetalDataFactory::Context& ctx,
TShader<CThermalColdFilter>::IDataBindingFactory* CThermalColdFilter::Initialize(boo::MetalDataFactory::Context& ctx,
boo::IShaderPipeline*& pipeOut,
boo::IVertexFormat*& vtxFmtOut)
{