diff options
Diffstat (limited to 'mp/src/public')
| -rw-r--r-- | mp/src/public/engine/IStaticPropMgr.h | 4 | ||||
| -rw-r--r-- | mp/src/public/engine/ivmodelrender.h | 5 | ||||
| -rw-r--r-- | mp/src/public/gamebspfile.h | 10 |
3 files changed, 11 insertions, 8 deletions
diff --git a/mp/src/public/engine/IStaticPropMgr.h b/mp/src/public/engine/IStaticPropMgr.h index ca06f8ff..b331fdb2 100644 --- a/mp/src/public/engine/IStaticPropMgr.h +++ b/mp/src/public/engine/IStaticPropMgr.h @@ -63,8 +63,6 @@ public: // Adds decals to static props, returns point of decal in trace_t
virtual void AddDecalToStaticProp( const Vector& rayStart, const Vector& rayEnd,
int staticPropIndex, int decalIndex, bool doTrace, trace_t& tr ) = 0;
- virtual void AddColorDecalToStaticProp( Vector const& rayStart, Vector const& rayEnd,
- int staticPropIndex, int decalIndex, bool doTrace, trace_t& tr, bool bUseColor, Color cColor ) = 0;
// Adds/removes shadows from static props
virtual void AddShadowToStaticProp( unsigned short shadowHandle, IClientRenderable* pRenderable ) = 0;
virtual void RemoveAllShadowsFromStaticProp( IClientRenderable* pRenderable ) = 0;
@@ -81,6 +79,8 @@ public: //===================================================================
virtual void DrawStaticProps( IClientRenderable **pProps, int count, bool bShadowDepth, bool drawVCollideWireframe ) = 0;
+ virtual void AddColorDecalToStaticProp( Vector const& rayStart, Vector const& rayEnd,
+ int staticPropIndex, int decalIndex, bool doTrace, trace_t& tr, bool bUseColor, Color cColor ) = 0;
};
class IStaticPropMgrServer : public IStaticPropMgr
diff --git a/mp/src/public/engine/ivmodelrender.h b/mp/src/public/engine/ivmodelrender.h index 5b60d893..56aea6c2 100644 --- a/mp/src/public/engine/ivmodelrender.h +++ b/mp/src/public/engine/ivmodelrender.h @@ -138,8 +138,6 @@ public: // radius of the decal to create.
virtual void AddDecal( ModelInstanceHandle_t handle, Ray_t const& ray,
Vector const& decalUp, int decalIndex, int body, bool noPokeThru = false, int maxLODToDecal = ADDDECAL_TO_ALL_LODS ) = 0;
- virtual void AddColoredDecal( ModelInstanceHandle_t handle, Ray_t const& ray,
- Vector const& decalUp, int decalIndex, int body, Color cColor, bool noPokeThru = false, int maxLODToDecal = ADDDECAL_TO_ALL_LODS ) = 0;
// Removes all the decals on a model instance
virtual void RemoveAllDecals( ModelInstanceHandle_t handle ) = 0;
@@ -176,6 +174,9 @@ public: virtual void SuppressEngineLighting( bool bSuppress ) = 0;
virtual void SetupColorMeshes( int nTotalVerts ) = 0;
+
+ virtual void AddColoredDecal( ModelInstanceHandle_t handle, Ray_t const& ray,
+ Vector const& decalUp, int decalIndex, int body, Color cColor, bool noPokeThru = false, int maxLODToDecal = ADDDECAL_TO_ALL_LODS ) = 0;
};
diff --git a/mp/src/public/gamebspfile.h b/mp/src/public/gamebspfile.h index 242d6ca9..786e0671 100644 --- a/mp/src/public/gamebspfile.h +++ b/mp/src/public/gamebspfile.h @@ -21,12 +21,14 @@ //-----------------------------------------------------------------------------
// This enumerations defines all the four-CC codes for the client lump names
//-----------------------------------------------------------------------------
+// TODO: We may have some endian considerations here!
+#define GAMELUMP_MAKE_CODE(a, b, c, d) ((a) << 24 | (b) << 16 | (c) << 8 | (d) << 0)
enum
{
- GAMELUMP_DETAIL_PROPS = 'dprp',
- GAMELUMP_DETAIL_PROP_LIGHTING = 'dplt',
- GAMELUMP_STATIC_PROPS = 'sprp',
- GAMELUMP_DETAIL_PROP_LIGHTING_HDR = 'dplh',
+ GAMELUMP_DETAIL_PROPS = GAMELUMP_MAKE_CODE('d', 'p', 'r', 'p'),
+ GAMELUMP_DETAIL_PROP_LIGHTING = GAMELUMP_MAKE_CODE('d', 'p', 'l', 't'),
+ GAMELUMP_STATIC_PROPS = GAMELUMP_MAKE_CODE('s', 'p', 'r', 'p'),
+ GAMELUMP_DETAIL_PROP_LIGHTING_HDR = GAMELUMP_MAKE_CODE('d', 'p', 'l', 'h'),
};
// Versions...
|