Skip to content

Commit eebe887

Browse files
committed
Method rename for shaders
1 parent a7f281d commit eebe887

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

SourceCode/Graphics/Materials.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ namespace Graphics
3434

3535
auto_STATIC_METHOD_(IMaterialManager, IMaterialManager*, Get);
3636

37-
auto_STATIC_METHOD(StandardShader, BOOL, PrepareRender, Args(RenderWare::Mesh<>* mesh), Args(mesh));
38-
auto_STATIC_METHOD(ShaderBuilder, BOOL, PrepareRender, Args(RenderWare::Mesh<>* mesh), Args(mesh));
37+
auto_STATIC_METHOD(StandardShader, BOOL, Load, Args(RenderWare::Mesh<>* mesh), Args(mesh));
38+
auto_STATIC_METHOD(ShaderBuilder, BOOL, Load, Args(RenderWare::Mesh<>* mesh), Args(mesh));
3939

4040
auto_STATIC_METHOD(MaterialShader, MaterialShader*, Initialize,
4141
Args(MaterialShader* dst, uint32_t shaderID, int arg_8, int arg_C, int arg_10, int arg_14, int arg_18, int arg_1C, int arg_20),

Spore ModAPI.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -930,6 +930,7 @@
930930
<None Include="Miscellaneous.dox" />
931931
<None Include="ModAPI.dox" />
932932
<None Include="Objects.dox" />
933+
<None Include="README.md" />
933934
<None Include="ShopperRequest.dox" />
934935
</ItemGroup>
935936
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

Spore ModAPI.vcxproj.filters

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1823,5 +1823,6 @@
18231823
<None Include="ShopperRequest.dox" />
18241824
<None Include="Objects.dox" />
18251825
<None Include="EditorRequest.dox" />
1826+
<None Include="README.md" />
18261827
</ItemGroup>
18271828
</Project>

Spore/Graphics/MaterialShader.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,16 @@ namespace Graphics
3434
public:
3535
/// This type of function is called when rendering a mesh, before the \c DrawIndexedPrimitives is called.
3636
/// This function is responsible of loading the shaders into DirectX.
37-
typedef BOOL(*PrepareRender_t)(RenderWare::Mesh<>*);
37+
typedef BOOL(*LoadShader_t)(RenderWare::Mesh<>*);
3838

3939
int AddRef();
4040

41-
inline PrepareRender_t GetPrepareRenderFunction() const {
41+
inline LoadShader_t GetLoadMethod() const {
4242
return mpCallback;
4343
}
4444

45-
inline void SetPrepareRenderFunction(PrepareRender_t function) {
46-
mpCallback = function;
45+
inline void SetLoadMethod(LoadShader_t method) {
46+
mpCallback = method;
4747
}
4848

4949
protected:
@@ -54,7 +54,7 @@ namespace Graphics
5454
/* 0Eh */ int16_t mVertexShaderVersion_;
5555
/* 10h */ int16_t mPixelShaderVersion;
5656
/* 12h */ int16_t mPixelShaderVersion_;
57-
/* 14h */ PrepareRender_t mpCallback;
57+
/* 14h */ LoadShader_t mpCallback;
5858
/* 18h */ int field_18;
5959
/* 1Ch */ int field_1C;
6060
/* 20h */ int field_20;

Spore/Graphics/ShaderBuilder.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace Graphics
3030

3131
/// This function is called when rendering a mesh, before the \c DrawIndexedPrimitives is called.
3232
/// This function is responsible of loading the shaders into DirectX.
33-
static BOOL PrepareRender(RenderWare::Mesh<>* mesh);
33+
static BOOL Load(RenderWare::Mesh<>* mesh);
3434

3535
protected:
3636
/* 48h */ vector<ShaderBuilderEntry> mVertexShaders[16];
@@ -44,6 +44,6 @@ namespace Graphics
4444
DeclareAddress(Read, SelectAddress(0x6FD980, , 0x6FD660));
4545
DeclareAddress(Release, SelectAddress(0x6FD6B0, , 0x6FD390));
4646

47-
DeclareAddress(PrepareRender, SelectAddress(0x6FDB80, , 0x6FD860));
47+
DeclareAddress(Load, SelectAddress(0x6FDB80, , 0x6FD860));
4848
}
4949
}

Spore/Graphics/StandardShader.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace Graphics
2323

2424
/// This function is called when rendering a mesh, before the \c DrawIndexedPrimitives is called.
2525
/// This function is responsible of loading the shaders into DirectX.
26-
static BOOL PrepareRender(RenderWare::Mesh<>* mesh);
26+
static BOOL Load(RenderWare::Mesh<>* mesh);
2727

2828
protected:
2929
/* 48h */ intrusive_ptr<IDirect3DVertexShader9> mVertexShaders[16];
@@ -40,6 +40,6 @@ namespace Graphics
4040
DeclareAddress(Reset, SelectAddress(0x6E62F0, , 0x6E5C40));
4141
DeclareAddress(Release, SelectAddress(0x6E5EC0, , 0x6E5810));
4242

43-
DeclareAddress(PrepareRender, SelectAddress(0x6E5C30, , 0x6E5590));
43+
DeclareAddress(Load, SelectAddress(0x6E5C30, , 0x6E5590));
4444
}
4545
}

0 commit comments

Comments
 (0)