mirror of
https://gitlab.com/GaryOderNichts/re3-wiiu.git
synced 2024-11-26 19:14:15 +01:00
some fixes and cosmetic changes
This commit is contained in:
parent
d9a3533438
commit
5b605c1271
@ -22,7 +22,7 @@ enum AssocGroupId
|
||||
ASSOCGRP_BUSYWOMAN,
|
||||
ASSOCGRP_SEXYWOMAN,
|
||||
ASSOCGRP_OLDWOMAN,
|
||||
ASSOCGRP_FARWOMAN,
|
||||
ASSOCGRP_FATWOMAN,
|
||||
ASSOCGRP_PANICCHUNKY,
|
||||
ASSOCGRP_PLAYERBACK,
|
||||
ASSOCGRP_PLAYERLEFT,
|
||||
|
@ -76,7 +76,7 @@ static int32 NextValidModelId(int32 mi, int32 step)
|
||||
int32 i = mi;
|
||||
while (result == -1) {
|
||||
i += step;
|
||||
if (i < 0 || i > 5500) {
|
||||
if (i < 0 || i > MODELINFOSIZE) {
|
||||
step = -step;
|
||||
continue;
|
||||
}
|
||||
|
@ -783,7 +783,7 @@ CFileLoader::LoadVehicleObject(const char *line)
|
||||
mi->SetTexDictionary(txd);
|
||||
for(p = gamename; *p; p++)
|
||||
if(*p == '_') *p = ' ';
|
||||
strncpy(mi->m_gameName, gamename, 32);
|
||||
strcpy(mi->m_gameName, gamename);
|
||||
mi->m_level = level;
|
||||
mi->m_compRules = comprules;
|
||||
|
||||
|
@ -43,7 +43,7 @@ CClumpModelInfo::CreateInstance(void)
|
||||
RpClumpForAllAtomics(clone, SetHierarchyForSkinAtomic, hier);
|
||||
anim = HAnimAnimationCreateForHierarchy(hier);
|
||||
RpHAnimHierarchySetCurrentAnim(hier, anim);
|
||||
// RpHAnimHierarchySetFlags(hier, (RpHAnimHierarchyFlag)(rpHANIMHIERARCHYUPDATEMODELLINGMATRICES|rpHANIMHIERARCHYUPDATELTMS));
|
||||
RpHAnimHierarchySetFlags(hier, (RpHAnimHierarchyFlag)(rpHANIMHIERARCHYUPDATEMODELLINGMATRICES|rpHANIMHIERARCHYUPDATELTMS));
|
||||
// the rest is xbox only:
|
||||
// RpSkinGetNumBones(RpSkinGeometryGetSkin(RpAtomicGetGeometry(IsClumpSkinned(clone))));
|
||||
RpHAnimHierarchyUpdateMatrices(hier);
|
||||
@ -113,7 +113,7 @@ CClumpModelInfo::SetClump(RpClump *clump)
|
||||
weights->w2 /= sum;
|
||||
weights->w3 /= sum;
|
||||
}
|
||||
// RpHAnimHierarchySetFlags(hier, (RpHAnimHierarchyFlag)(rpHANIMHIERARCHYUPDATEMODELLINGMATRICES|rpHANIMHIERARCHYUPDATELTMS));
|
||||
RpHAnimHierarchySetFlags(hier, (RpHAnimHierarchyFlag)(rpHANIMHIERARCHYUPDATEMODELLINGMATRICES|rpHANIMHIERARCHYUPDATELTMS));
|
||||
}
|
||||
#endif
|
||||
}
|
||||
@ -139,13 +139,12 @@ CClumpModelInfo::FindFrameFromIdCB(RwFrame *frame, void *data)
|
||||
{
|
||||
RwObjectIdAssociation *assoc = (RwObjectIdAssociation*)data;
|
||||
|
||||
if(CVisibilityPlugins::GetFrameHierarchyId(frame) != assoc->id){
|
||||
RwFrameForAllChildren(frame, FindFrameFromIdCB, assoc);
|
||||
return assoc->frame ? nil : frame;
|
||||
}else{
|
||||
if(CVisibilityPlugins::GetFrameHierarchyId(frame) == assoc->id){
|
||||
assoc->frame = frame;
|
||||
return nil;
|
||||
}
|
||||
RwFrameForAllChildren(frame, FindFrameFromIdCB, assoc);
|
||||
return assoc->frame ? nil : frame;
|
||||
}
|
||||
|
||||
RwFrame*
|
||||
@ -153,13 +152,12 @@ CClumpModelInfo::FindFrameFromNameCB(RwFrame *frame, void *data)
|
||||
{
|
||||
RwObjectNameAssociation *assoc = (RwObjectNameAssociation*)data;
|
||||
|
||||
if(CGeneral::faststricmp(GetFrameNodeName(frame), assoc->name)){
|
||||
RwFrameForAllChildren(frame, FindFrameFromNameCB, assoc);
|
||||
return assoc->frame ? nil : frame;
|
||||
}else{
|
||||
if(!CGeneral::faststricmp(GetFrameNodeName(frame), assoc->name)){
|
||||
assoc->frame = frame;
|
||||
return nil;
|
||||
}
|
||||
RwFrameForAllChildren(frame, FindFrameFromNameCB, assoc);
|
||||
return assoc->frame ? nil : frame;
|
||||
}
|
||||
|
||||
RwFrame*
|
||||
@ -167,14 +165,13 @@ CClumpModelInfo::FindFrameFromNameWithoutIdCB(RwFrame *frame, void *data)
|
||||
{
|
||||
RwObjectNameAssociation *assoc = (RwObjectNameAssociation*)data;
|
||||
|
||||
if(CVisibilityPlugins::GetFrameHierarchyId(frame) ||
|
||||
CGeneral::faststricmp(GetFrameNodeName(frame), assoc->name)){
|
||||
RwFrameForAllChildren(frame, FindFrameFromNameWithoutIdCB, assoc);
|
||||
return assoc->frame ? nil : frame;
|
||||
}else{
|
||||
if(CVisibilityPlugins::GetFrameHierarchyId(frame) == 0 &&
|
||||
!CGeneral::faststricmp(GetFrameNodeName(frame), assoc->name)){
|
||||
assoc->frame = frame;
|
||||
return nil;
|
||||
}
|
||||
RwFrameForAllChildren(frame, FindFrameFromNameWithoutIdCB, assoc);
|
||||
return assoc->frame ? nil : frame;
|
||||
}
|
||||
|
||||
RwFrame*
|
||||
|
@ -36,7 +36,8 @@ public:
|
||||
|
||||
static RwObjectNameIdAssocation m_pPedIds[PED_NODE_MAX];
|
||||
|
||||
CPedModelInfo(void) : CClumpModelInfo(MITYPE_PED) { }
|
||||
CPedModelInfo(void) : CClumpModelInfo(MITYPE_PED) { m_hitColModel = nil; }
|
||||
~CPedModelInfo(void) { delete m_hitColModel; }
|
||||
void DeleteRwObject(void);
|
||||
void SetClump(RpClump *);
|
||||
|
||||
|
@ -150,7 +150,7 @@ void
|
||||
CSimpleModelInfo::SetupBigBuilding(void)
|
||||
{
|
||||
CSimpleModelInfo *related;
|
||||
if(m_lodDistances[0] > LOD_DISTANCE && m_atomics[2] == nil){
|
||||
if(m_lodDistances[0] > LOD_DISTANCE && GetRelatedModel() == nil){
|
||||
m_isBigBuilding = 1;
|
||||
FindRelatedModel();
|
||||
related = GetRelatedModel();
|
||||
|
@ -33,13 +33,18 @@ CPedIK::CPedIK(CPed *ped)
|
||||
|
||||
#ifdef PED_SKIN
|
||||
inline RwMatrix*
|
||||
GetComponentMatrix(CPed *ped, int32 node)
|
||||
GetBoneMatrix(CPed *ped, int32 bone)
|
||||
{
|
||||
RpHAnimHierarchy *hier = GetAnimHierarchyFromSkinClump(ped->GetClump());
|
||||
int idx = RpHAnimIDGetIndex(hier, ped->m_pFrames[node]->nodeID);
|
||||
int idx = RpHAnimIDGetIndex(hier, bone);
|
||||
RwMatrix *mats = RpHAnimHierarchyGetMatrixArray(hier);
|
||||
return &mats[idx];
|
||||
}
|
||||
inline RwMatrix*
|
||||
GetComponentMatrix(CPed *ped, int32 node)
|
||||
{
|
||||
return GetBoneMatrix(ped, ped->m_pFrames[node]->nodeID);
|
||||
}
|
||||
#endif
|
||||
|
||||
void
|
||||
@ -245,7 +250,7 @@ CPedIK::LookInDirection(float phi, float theta)
|
||||
}
|
||||
|
||||
// parent of head is torso
|
||||
RwMatrix worldMat = *GetComponentMatrix(m_ped, BONE_torso);
|
||||
RwMatrix worldMat = *GetBoneMatrix(m_ped, BONE_torso);
|
||||
ExtractYawAndPitchWorld(&worldMat, &yaw, &pitch);
|
||||
|
||||
LimbMoveStatus headStatus = MoveLimb(m_headOrient, CGeneral::LimitRadianAngle(phi - yaw),
|
||||
|
@ -147,7 +147,11 @@ CVisibilityPlugins::RenderFadingEntities(void)
|
||||
if(e->m_rwObject == nil)
|
||||
continue;
|
||||
mi = (CSimpleModelInfo *)CModelInfo::GetModelInfo(e->GetModelIndex());
|
||||
#ifdef FIX_BUGS
|
||||
if(mi->GetModelType() == MITYPE_SIMPLE && mi->m_noZwrite)
|
||||
#else
|
||||
if(mi->m_noZwrite)
|
||||
#endif
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, FALSE);
|
||||
|
||||
if(e->bDistanceFade){
|
||||
@ -159,7 +163,11 @@ CVisibilityPlugins::RenderFadingEntities(void)
|
||||
}else
|
||||
CRenderer::RenderOneNonRoad(e);
|
||||
|
||||
#ifdef FIX_BUGS
|
||||
if(mi->GetModelType() == MITYPE_SIMPLE && mi->m_noZwrite)
|
||||
#else
|
||||
if(mi->m_noZwrite)
|
||||
#endif
|
||||
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)TRUE);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user