more stubs

DataSpec/DNAMP1/CMDLMaterials.cpp

@@ -623,9 +623,9 @@ void _ConstructMaterial(Stream& out,
 
     /* Blend factors */
     using BlendFactor = MaterialSet::Material::BlendFactor;
-    if (material.blendDestFactor() != BlendFactor::GX_BL_ZERO)
+    if (material.blendDstFac != BlendFactor::GX_BL_ZERO)
     {
-        if (material.blendDestFactor() == BlendFactor::GX_BL_ONE)
+        if (material.blendDstFac == BlendFactor::GX_BL_ONE)
             out << "new_material.game_settings.alpha_blend = 'ADD'\n"
                    "new_material.use_transparency = True\n"
                    "new_material.transparency_method = 'RAYTRACE'\n"

DataSpec/DNAMP1/CMDLMaterials.hpp

@@ -107,7 +107,7 @@ struct MaterialSet : BigDNA
         Vector<GX::Color, DNA_COUNT(flags.konstValuesEnabled() ? konstCount[0] : 0)> konstColors;
 
         /** Slightly modified blend enums in Retro's implementation */
-        enum BlendFactor
+        enum BlendFactor : atUint16
         {
             GX_BL_ZERO,
             GX_BL_ONE,
@@ -118,12 +118,8 @@ struct MaterialSet : BigDNA
             GX_BL_DSTALPHA,
             GX_BL_INVDSTALPHA
         };
-        Value<atUint16> _blendDstFac;
-        inline BlendFactor blendDestFactor() const {return BlendFactor(_blendDstFac);}
-        inline void setBlendDestFactor(BlendFactor fac) {_blendDstFac = fac;}
-        Value<atUint16> _blendSrcFac;
-        inline BlendFactor blendSrcFactor() const {return BlendFactor(_blendSrcFac);}
-        inline void setBlendSrcFactor(BlendFactor fac) {_blendSrcFac = fac;}
+        Value<BlendFactor> blendDstFac;
+        Value<BlendFactor> blendSrcFac;
         Vector<atUint32, DNA_COUNT(flags.samusReflectionIndirectTexture())> indTexSlot;
 
         Value<atUint32> colorChannelCount;

DataSpec/DNAMP2/CMDLMaterials.hpp

@@ -34,13 +34,9 @@ struct MaterialSet : BigDNA
         Vector<atUint32, DNA_COUNT(flags.konstValuesEnabled())> konstCount;
         Vector<GX::Color, DNA_COUNT(flags.konstValuesEnabled() ? konstCount[0] : 0)> konstColors;
 
-        Value<atUint16> _blendDstFac;
         using BlendFactor = DNAMP1::MaterialSet::Material::BlendFactor;
-        inline BlendFactor blendDestFactor() const {return BlendFactor(_blendDstFac);}
-        inline void setBlendDestFactor(BlendFactor fac) {_blendDstFac = fac;}
-        Value<atUint16> _blendSrcFac;
-        inline BlendFactor blendSrcFactor() const {return BlendFactor(_blendSrcFac);}
-        inline void setBlendSrcFactor(BlendFactor fac) {_blendSrcFac = fac;}
+        Value<BlendFactor> blendDstFac;
+        Value<BlendFactor> blendSrcFac;
         Vector<atUint32, DNA_COUNT(flags.samusReflectionIndirectTexture())> indTexSlot;
 
         Value<atUint32> colorChannelCount;

Runtime/CAreaOctTree.hpp

@@ -0,0 +1,13 @@
+#ifndef __RETRO_CAREAOCTTREE_HPP__
+#define __RETRO_CAREAOCTTREE_HPP__
+
+namespace Retro
+{
+
+class CAreaOctTree
+{
+};
+
+}
+
+#endif // __RETRO_CAREAOCTTREE_HPP__

Runtime/CMakeLists.txt

@@ -39,6 +39,9 @@ add_library(RuntimeCommon
             CMainFlow.hpp CMainFlow.cpp
             CArchitectureMessage.hpp
             CArchitectureQueue.hpp CArchitectureQueue.cpp
+            IObj.hpp
+            CToken.hpp
+            CAreaOctTree.hpp CAreaOctTree.cpp
             GameGlobalObjects.hpp
             RetroTypes.hpp
             GCNTypes.hpp)

Runtime/CToken.hpp

@@ -0,0 +1,18 @@
+#ifndef __RETRO_CTOKEN_HPP__
+#define __RETRO_CTOKEN_HPP__
+
+namespace Retro
+{
+
+class CToken
+{
+};
+
+template<class T>
+class TLockedToken
+{
+};
+
+}
+
+#endif // __RETRO_CTOKEN_HPP__

Runtime/Graphics/CLight.hpp

@@ -0,0 +1,8 @@
+#ifndef __RETRO_CLIGHT_HPP__
+#define __RETRO_CLIGHT_HPP__
+
+class CLight
+{
+};
+
+#endif // __RETRO_CLIGHT_HPP__

Runtime/Graphics/CMakeLists.txt

@@ -1,2 +1,5 @@
 add_library(RuntimeCommonGraphics
-            CBooRenderer.hpp CBooRenderer.cpp)
+            IRenderer.hpp
+            CBooRenderer.hpp CBooRenderer.cpp
+            CMetroidModelInstance.hpp
+            CLight.hpp)

Runtime/Graphics/CMetroidModelInstance.hpp

@@ -0,0 +1,13 @@
+#ifndef __RETRO_CMETROIDMODELINSTANCE_HPP__
+#define __RETRO_CMETROIDMODELINSTANCE_HPP__
+
+namespace Retro
+{
+
+class CMetroidModelInstance
+{
+};
+
+}
+
+#endif // __RETRO_CMETROIDMODELINSTANCE_HPP__

Runtime/Graphics/IRenderer.hpp

@@ -0,0 +1,98 @@
+#ifndef __RETRO_IRENDERER_HPP__
+#define __RETRO_IRENDERER_HPP__
+
+#include <vector>
+#include "../RetroTypes.hpp"
+#include "../CToken.hpp"
+#include "CAABox.hpp"
+#include "CPlane.hpp"
+#include "CFrustum.hpp"
+#include "CColor.hpp"
+
+namespace Retro
+{
+class CMetroidModelInstance;
+class CLight;
+class CAreaOctTree;
+class CParticleGen;
+class CModel;
+class CSkinnedModel;
+
+class IRenderer
+{
+public:
+    typedef void(*TDrawableCallback)(const void*, const void*, int);
+    typedef void(*TReflectionCallback)(void*, const CVector3f&);
+    enum EDrawableSorting
+    {
+    };
+    enum EDebugOption
+    {
+    };
+    enum EPrimitiveType
+    {
+    };
+    enum ERglFogMode
+    {
+    };
+
+    virtual void AddStaticGeometry(const std::vector<CMetroidModelInstance>&, const CAreaOctTree*, int);
+    virtual void RemoveStaticGeometry(const std::vector<CMetroidModelInstance>&);
+    virtual void DrawUnsortedGeometry(const std::vector<CLight>&, int, unsigned int, unsigned int);
+    virtual void DrawSortedGeometry(const std::vector<CLight>&, int, unsigned int, unsigned int);
+    virtual void DrawStaticGeometry(const std::vector<CLight>&, int, unsigned int, unsigned int);
+    virtual void PostRenderFogs();
+    virtual void AddParticleGen(const CParticleGen&);
+    virtual void AddPlaneObject(const void*, const CAABox&, const CPlane&, int);
+    virtual void AddDrawable(void const *, const CVector3f&, const CAABox&, int, EDrawableSorting);
+    virtual void SetDrawableCallback(TDrawableCallback, const void*);
+    virtual void SetWorldViewpoint(const CTransform&);
+    virtual void SetPerspectiveFovScalar(float);
+    virtual void SetPerspective(float,float,float,float,float);
+    virtual void SetPerspective(float,float,float,float);
+    virtual void SetViewportOrtho(bool,float,float);
+    virtual void SetClippingPlanes(const CFrustum&);
+    virtual void SetViewport(int,int,int,int);
+    virtual void SetDepthReadWrite(bool,bool);
+    virtual void SetBlendMode_AdditiveAlpha();
+    virtual void SetBlendMode_AlphaBlended();
+    virtual void SetBlendMode_NoColorWrite();
+    virtual void SetBlendMode_ColorMultiply();
+    virtual void SetBlendMode_InvertDst();
+    virtual void SetBlendMode_InvertSrc();
+    virtual void SetBlendMode_Replace();
+    virtual void SetBlendMode_AdditiveDestColor();
+    virtual void SetDebugOption(EDebugOption,int);
+    virtual void BeginScene();
+    virtual void EndScene();
+    virtual void BeginPrimitive(EPrimitiveType,int);
+    virtual void BeginLines(int);
+    virtual void BeginLineStrip(int);
+    virtual void BeginTriangles(int);
+    virtual void BeginTriangleStrip(int);
+    virtual void BeginTriangleFan(int);
+    virtual void PrimVertex(const CVector3f&);
+    virtual void PrimNormal(const CVector3f&);
+    virtual void PrimColor(float,float,float,float);
+    virtual void PrimColor(const CColor&);
+    virtual void EndPrimitive();
+    virtual void SetAmbientColor(const CColor&);
+    virtual void SetStaticWorldAmbientColor(const CColor&);
+    virtual void DrawString(const char*, int, int);
+    virtual u32 GetFPS();
+    virtual void CacheReflection(TReflectionCallback, void*, bool);
+    virtual void DrawSpaceWarp(const CVector3f&, float);
+    virtual void DrawThermalModel(const CModel&, const CColor&, const CColor&, const float*, const float*);
+    virtual void DrawXRayOutline(const CModel&, const float*, const float*);
+    virtual void SetWireframeFlags(int);
+    virtual void SetWorldFog(ERglFogMode, float, float, const CColor&);
+    virtual void RenderFogVolume(const CColor&, const CAABox&, const TLockedToken<CModel>*, const CSkinnedModel*);
+    virtual void SetThermal(bool, float, const CColor&);
+    virtual void DoThermalBlendCold();
+    virtual void DoThermalBlendHot();
+    virtual u32 GetStaticWorldDataSize();
+};
+
+}
+
+#endif // __RETRO_IRENDERER_HPP__

Runtime/IObj.hpp

@@ -0,0 +1,22 @@
+#ifndef __RETRO_IOBJ_HPP__
+#define __RETRO_IOBJ_HPP__
+
+#include <HECL/HECL.hpp>
+#include "RetroTypes.hpp"
+
+namespace Retro
+{
+
+struct SObjectTag
+{
+    HECL::FourCC fcc;
+    u32 id;
+};
+
+class IObj
+{
+};
+
+}
+
+#endif // __RETRO_IOBJ_HPP__

Runtime/Particle/CElementGen.hpp

@@ -1,10 +1,12 @@
 #ifndef __RETRO_CELEMENTGEN_HPP__
 #define __RETRO_CELEMENTGEN_HPP__
 
+#include "CParticleGen.hpp"
+
 namespace Retro
 {
 
-class CElementGen
+class CElementGen : public CParticleGen
 {
 public:
     static void Initialize()

Runtime/Particle/CMakeLists.txt

@@ -1,3 +1,7 @@
 add_library(RuntimeCommonParticle
+            CParticleGen.hpp CParticleGen.cpp
             CElementGen.hpp CElementGen.cpp
-            CDecalManager.hpp CDecalManager.cpp)
+            CParticleSwoosh.hpp CParticleSwoosh.cpp
+            CParticleElectric.hpp CParticleElectric.cpp
+            CDecalManager.hpp CDecalManager.cpp
+            CWarp.hpp CWarp.cpp)

Runtime/Particle/CParticleElectric.hpp

@@ -0,0 +1,15 @@
+#ifndef __RETRO_CPARTICLEELECTRIC_HPP__
+#define __RETRO_CPARTICLEELECTRIC_HPP__
+
+#include "CParticleGen.hpp"
+
+namespace Retro
+{
+
+class CParticleElectric : public CParticleGen
+{
+};
+
+}
+
+#endif // __RETRO_CPARTICLEELECTRIC_HPP__

Runtime/Particle/CParticleGen.hpp

@@ -0,0 +1,47 @@
+#ifndef __RETRO_CPARTICLEGEN_HPP__
+#define __RETRO_CPARTICLEGEN_HPP__
+
+#include "../RetroTypes.hpp"
+#include "CParticleGen.hpp"
+#include "CTransform.hpp"
+#include "CColor.hpp"
+#include "CAABox.hpp"
+
+namespace Retro
+{
+class CWarp;
+class CLight;
+
+class CParticleGen
+{
+public:
+    virtual ~CParticleGen() {}
+    virtual void Update(double);
+    virtual void Render();
+    virtual void SetOrientation(const CTransform&);
+    virtual void SetTranslation(const CVector3f&);
+    virtual void SetGlobalOrientation(const CTransform&);
+    virtual void SetGlobalTranslation(const CVector3f&);
+    virtual void SetGlobalScale(const CVector3f&);
+    virtual void SetLocalScale(const CVector3f&);
+    virtual void SetParticleEmission(bool);
+    virtual void SetModulationColor(const CColor&);
+    virtual const CTransform& GetOrientation() const;
+    virtual const CVector3f& GetTranslation() const;
+    virtual const CTransform& GetGlobalOrientation() const;
+    virtual const CVector3f& GetGlobalTranslation() const;
+    virtual const CVector3f& GetGlobalScale() const;
+    virtual bool GetParticleEmission() const;
+    virtual const CColor& GetModulationColor() const;
+    virtual bool IsSystemDeletable() const;
+    virtual CAABox GetBounds() const;
+    virtual u32 GetParticleCount() const;
+    virtual bool SystemHasLight() const;
+    virtual CLight GetLight() const;
+    virtual void DestroyParticles();
+    virtual void AddModifier(CWarp*);
+};
+
+}
+
+#endif // __RETRO_CPARTICLEGEN_HPP__

Runtime/Particle/CParticleSwoosh.hpp

@@ -0,0 +1,15 @@
+#ifndef __RETRO_CPARTICLESWOOSH_HPP__
+#define __RETRO_CPARTICLESWOOSH_HPP__
+
+#include "CParticleGen.hpp"
+
+namespace Retro
+{
+
+class CParticleSwoosh : public CParticleGen
+{
+};
+
+}
+
+#endif // __RETRO_CPARTICLESWOOSH_HPP__

Runtime/Particle/CWarp.hpp

@@ -0,0 +1,13 @@
+#ifndef __RETRO_CWARP_HPP__
+#define __RETRO_CWARP_HPP__
+
+namespace Retro
+{
+
+class CWarp
+{
+};
+
+}
+
+#endif // __RETRO_CWARP_HPP__

hecl

@@ -1 +1 @@
-Subproject commit b96d1e8d9a7912674b91f3c3878f524c25901ef8
+Subproject commit 2a9a822dc7643c43731876ae506fcef43b7550ae