Skip to content

Finalize MovieSystem stub using existing headers #120

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

Merged
Rosalie241 merged 1 commit into from
Sep 23, 2026
Merged

Finalize MovieSystem stub using existing headers #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Spore ModAPI/SourceCode/Movie/MovieSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ namespace Movie
{
}

auto_METHOD_VIRTUAL_VOID(MovieSystem, RenderWare::ILayer, DrawLayer,
Args(uint32_t flags, uint32_t layerNumber, const void* const* viewer, RenderWare::RenderStats* stats),
Args(flags, layerNumber, viewer, stats)
auto_METHOD_VIRTUAL_VOID(MovieSystem, Graphics::ILayer, DrawLayer,
Args(int flags, int layerIndex, App::cViewer** viewers, Graphics::RenderStatistics& statistics),
Args(flags, layerIndex, viewers, statistics)
);


Expand Down
5 changes: 0 additions & 5 deletions Spore ModAPI/SourceCode/Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,3 @@ int RefCountTemplateAtomic::Release()
}
return mnRefCount;
}


IRefCount::~IRefCount()
{
}
6 changes: 0 additions & 6 deletions Spore ModAPI/SourceCode/RenderWare/RenderWare.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
****************************************************************************/
#include <Spore\RenderWare\RWHeader.h>
#include <Spore\RenderWare\CompiledState.h>
#include <Spore\RenderWare\ILayer.h>

namespace RenderWare
{
Expand All @@ -45,9 +44,4 @@ namespace RenderWare
}
return false;
}


ILayer::~ILayer()
{
}
}
2 changes: 0 additions & 2 deletions Spore ModAPI/Spore ModAPI.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,8 +338,6 @@
<ClInclude Include="Spore\Movie\cMoviePlayInfo.h" />
<ClInclude Include="Spore\Movie\cMovieRecordInfo.h" />
<ClInclude Include="Spore\Movie\MovieSystem.h" />
<ClInclude Include="Spore\RenderWare\ILayer.h" />
<ClInclude Include="Spore\RenderWare\RenderStats.h" />
<ClInclude Include="Spore\Swarm\cDecal.h" />
<ClInclude Include="Spore\Terrain\cTerrainDecal.h" />
<ClInclude Include="Spore\Terrain\cTerrainSphereDecal.h" />
Expand Down
6 changes: 0 additions & 6 deletions Spore ModAPI/Spore ModAPI.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2319,12 +2319,6 @@
<ClInclude Include="Spore\Movie\MovieSystem.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Spore\RenderWare\ILayer.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="Spore\RenderWare\RenderStats.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="SourceCode\Allocator.cpp">
Expand Down
14 changes: 7 additions & 7 deletions Spore ModAPI/Spore/Graphics/RenderStatistics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ namespace Graphics
struct RenderStatistics
{
// related with total render time
/* 00h */ float field_0;
/* 04h */ float field_4;
/* 08h */ float field_8;
/* 0Ch */ float field_C;
/* 10h */ float field_10;
/* 00h */ float msPerFrame;
/* 04h */ float fps;
/* 08h */ float msPerFrameSmoothed;
/* 0Ch */ float fpsSmoothed;
/* 10h */ float renderTime;
/* 14h */ int numLayersRendered;
/* 18h */ int field_18;
/* 1Ch */ int field_1C;
/* 18h */ int numJobs;
/* 1Ch */ int numJobsQueued;
/* 20h */ int numVerticesRendered;
/* 24h */ int numIndicesRendered;
/* 28h */ int numDrawCalls;
Expand Down
8 changes: 5 additions & 3 deletions Spore ModAPI/Spore/Movie/MovieSystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#pragma once

#include <Spore\Internal.h>
#include <Spore\RenderWare\ILayer.h>
#include <Spore\ResourceKey.h>
#include <Spore\Graphics\ILayer.h>
#include <Spore\Graphics\RenderStatistics.h>
#include <Spore\Movie\cMoviePlayInfo.h>
#include <Spore\Movie\cMovieRecordInfo.h>

Expand Down Expand Up @@ -33,7 +35,7 @@ namespace Movie
ASSERT_SIZE(IMovieSystem, 0x4);

class MovieSystem
: public RenderWare::ILayer
: public Graphics::ILayer
, public IMovieSystem
{
public:
Expand All @@ -44,7 +46,7 @@ namespace Movie
virtual int AddRef() override;
virtual int Release() override;

virtual void DrawLayer(uint32_t flags, uint32_t layerNumber, const void* const* viewer, RenderWare::RenderStats* stats) override;
virtual void DrawLayer(int flags, int layerIndex, App::cViewer** viewers, Graphics::RenderStatistics& statistics) override;

virtual bool Init() override;
virtual bool Shutdown() override;
Expand Down
10 changes: 0 additions & 10 deletions Spore ModAPI/Spore/Object.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,16 +175,6 @@ class RefCountTemplateAtomic
int mnRefCount;
};

class IRefCount
{
public:
virtual int AddRef() = 0;
virtual int Release() = 0;
virtual ~IRefCount();

static const uint32_t TYPE = 0xAE9CB0FA;
};

///////////////////////////////////
//// INTERNAL IMPLEMENENTATION ////
///////////////////////////////////
Expand Down
18 changes: 0 additions & 18 deletions Spore ModAPI/Spore/RenderWare/ILayer.h
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions Spore ModAPI/Spore/RenderWare/RenderStats.h
View file
Open in desktop

This file was deleted.

Loading