summaryrefslogtreecommitdiffstats
path: root/src/modelinfo
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-08-19 14:36:38 +0200
committerGitHub <noreply@github.com>2020-08-19 14:36:38 +0200
commit76fe1247c86873fa548c85ae8598efd4ce1947c2 (patch)
tree0d7d5e42a8e92841af0f89dc577eb0888831fd9f /src/modelinfo
parentIsland loading cleanup and fix (diff)
parentMerge branch 'master' of github.com:gtamodding/re3 (diff)
downloadre3-76fe1247c86873fa548c85ae8598efd4ce1947c2.tar
re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.tar.gz
re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.tar.bz2
re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.tar.lz
re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.tar.xz
re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.tar.zst
re3-76fe1247c86873fa548c85ae8598efd4ce1947c2.zip
Diffstat (limited to 'src/modelinfo')
-rw-r--r--src/modelinfo/PedModelInfo.cpp5
-rw-r--r--src/modelinfo/SimpleModelInfo.cpp5
-rw-r--r--src/modelinfo/VehicleModelInfo.cpp5
3 files changed, 14 insertions, 1 deletions
diff --git a/src/modelinfo/PedModelInfo.cpp b/src/modelinfo/PedModelInfo.cpp
index 60c63114..117fd378 100644
--- a/src/modelinfo/PedModelInfo.cpp
+++ b/src/modelinfo/PedModelInfo.cpp
@@ -8,6 +8,7 @@
#include "NodeName.h"
#include "VisibilityPlugins.h"
#include "ModelInfo.h"
+#include "custompipes.h"
void
CPedModelInfo::DeleteRwObject(void)
@@ -91,8 +92,10 @@ CPedModelInfo::findLimbsCb(RpAtomic *atomic, void *data)
void
CPedModelInfo::SetClump(RpClump *clump)
{
+#ifdef EXTENDED_PIPELINES
+ CustomPipes::AttachRimPipe(clump);
+#endif
#ifdef PED_SKIN
-
// CB has to be set here before atomics are detached from clump
if(strncmp(GetName(), "player", 7) == 0)
RpClumpForAllAtomics(clump, SetAtomicRendererCB, (void*)CVisibilityPlugins::RenderPlayerCB);
diff --git a/src/modelinfo/SimpleModelInfo.cpp b/src/modelinfo/SimpleModelInfo.cpp
index 32204500..416bdad5 100644
--- a/src/modelinfo/SimpleModelInfo.cpp
+++ b/src/modelinfo/SimpleModelInfo.cpp
@@ -3,6 +3,7 @@
#include "General.h"
#include "Camera.h"
#include "ModelInfo.h"
+#include "custompipes.h"
#define LOD_DISTANCE (300.0f)
@@ -75,6 +76,10 @@ CSimpleModelInfo::SetAtomic(int n, RpAtomic *atomic)
RpGeometry *geo = RpAtomicGetGeometry(atomic);
RpGeometrySetFlags(geo, RpGeometryGetFlags(geo) & ~rpGEOMETRYLIGHT);
}
+
+#ifdef EXTENDED_PIPELINES
+ CustomPipes::AttachWorldPipe(atomic);
+#endif
}
void
diff --git a/src/modelinfo/VehicleModelInfo.cpp b/src/modelinfo/VehicleModelInfo.cpp
index d8b388d5..a024bb40 100644
--- a/src/modelinfo/VehicleModelInfo.cpp
+++ b/src/modelinfo/VehicleModelInfo.cpp
@@ -19,6 +19,7 @@
#include "Bike.h"
#include "ModelIndices.h"
#include "ModelInfo.h"
+#include "custompipes.h"
int8 CVehicleModelInfo::ms_compsToUse[2] = { -2, -2 };
int8 CVehicleModelInfo::ms_compsUsed[2];
@@ -1037,6 +1038,10 @@ CVehicleModelInfo::SetEnvironmentMap(void)
SetEnvironmentMapCB(wheelmi->m_atomics[i], m_envMap);
}
}
+
+#ifdef EXTENDED_PIPELINES
+ CustomPipes::AttachVehiclePipe(m_clump);
+#endif
}
void