Merge pull request #688 from aap/master

Neo pipelines
This commit is contained in:
aap
2020-08-19 14:36:38 +02:00
committed by GitHub
61 changed files with 3723 additions and 18 deletions

View File

@ -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);

View File

@ -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

View File

@ -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