The-Homebrew-Cloud/re3-wiiu
2
0
Fork 0
mirror of https://gitlab.com/GaryOderNichts/re3-wiiu.git synced 2024-11-29 20:44:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

few fixes

Browse Source
This commit is contained in:
aap 2020-05-11 09:18:41 +02:00
parent c66c45f4c8
commit b11715608f
5 changed files with 53 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/animation/FrameUpdate.cpp
View File

@ -47,6 +47,11 @@ FrameUpdateCallBackNonSkinned(AnimBlendFrameData *frame, void *arg)
(*node)->Update(vec, q, 1.0f-totalBlendAmount); (*node)->Update(vec, q, 1.0f-totalBlendAmount);
if((*node)->sequence->HasTranslation()) if((*node)->sequence->HasTranslation())
pos += vec; pos += vec;
#ifdef FIX_BUGS
if(DotProduct(rot, q) < 0.0f)
rot -= q;
else
#endif
rot += q; rot += q;
} }
++*node; ++*node;
@ -101,6 +106,11 @@ FrameUpdateCallBackWithVelocityExtractionNonSkinned(AnimBlendFrameData *frame, v
for(node = updateData->nodes; *node; node++){ for(node = updateData->nodes; *node; node++){
if((*node)->sequence){ if((*node)->sequence){
bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount); bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount);
#ifdef FIX_BUGS
if(DotProduct(rot, q) < 0.0f)
rot -= q;
else
#endif
rot += q; rot += q;
if((*node)->sequence->HasTranslation()){ if((*node)->sequence->HasTranslation()){
pos += vec; pos += vec;
@ -179,6 +189,11 @@ FrameUpdateCallBackWith3dVelocityExtractionNonSkinned(AnimBlendFrameData *frame,
for(node = updateData->nodes; *node; node++){ for(node = updateData->nodes; *node; node++){
if((*node)->sequence){ if((*node)->sequence){
bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount); bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount);
#ifdef FIX_BUGS
if(DotProduct(rot, q) < 0.0f)
rot -= q;
else
#endif
rot += q; rot += q;
if((*node)->sequence->HasTranslation()){ if((*node)->sequence->HasTranslation()){
pos += vec; pos += vec;
@ -243,6 +258,11 @@ FrameUpdateCallBackSkinned(AnimBlendFrameData *frame, void *arg)
(*node)->Update(vec, q, 1.0f-totalBlendAmount); (*node)->Update(vec, q, 1.0f-totalBlendAmount);
if((*node)->sequence->HasTranslation()) if((*node)->sequence->HasTranslation())
pos += vec; pos += vec;
#ifdef FIX_BUGS
if(DotProduct(rot, q) < 0.0f)
rot -= q;
else
#endif
rot += q; rot += q;
} }
++*node; ++*node;
@ -298,6 +318,11 @@ FrameUpdateCallBackWithVelocityExtractionSkinned(AnimBlendFrameData *frame, void
for(node = updateData->nodes; *node; node++){ for(node = updateData->nodes; *node; node++){
if((*node)->sequence){ if((*node)->sequence){
bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount); bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount);
#ifdef FIX_BUGS
if(DotProduct(rot, q) < 0.0f)
rot -= q;
else
#endif
rot += q; rot += q;
if((*node)->sequence->HasTranslation()){ if((*node)->sequence->HasTranslation()){
pos += vec; pos += vec;
@ -376,6 +401,11 @@ FrameUpdateCallBackWith3dVelocityExtractionSkinned(AnimBlendFrameData *frame, vo
for(node = updateData->nodes; *node; node++){ for(node = updateData->nodes; *node; node++){
if((*node)->sequence){ if((*node)->sequence){
bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount); bool nodelooped = (*node)->Update(vec, q, 1.0f-totalBlendAmount);
#ifdef FIX_BUGS
if(DotProduct(rot, q) < 0.0f)
rot -= q;
else
#endif
rot += q; rot += q;
if((*node)->sequence->HasTranslation()){ if((*node)->sequence->HasTranslation()){
pos += vec; pos += vec;

6
src/animation/RpAnimBlend.cpp
View File

@ -348,9 +348,11 @@ CAnimBlendAssociation*
RpAnimBlendClumpGetFirstAssociation(RpClump *clump) RpAnimBlendClumpGetFirstAssociation(RpClump *clump)
{ {
CAnimBlendClumpData *clumpData = *RPANIMBLENDCLUMPDATA(clump); CAnimBlendClumpData *clumpData = *RPANIMBLENDCLUMPDATA(clump);
if(clumpData == nil) return nil; if(!RpAnimBlendClumpIsInitialized(clump))
if(clumpData->link.next == nil) return nil; return nil;
if(clumpData->link.next)
return CAnimBlendAssociation::FromLink(clumpData->link.next); return CAnimBlendAssociation::FromLink(clumpData->link.next);
return nil;
} }
// FillFrameArrayCallBack on PS2 // FillFrameArrayCallBack on PS2

3
src/core/Cam.cpp
View File

@ -4540,6 +4540,9 @@ CCam::Process_FollowPed_Rotation(const CVector &CameraTarget, float TargetOrient
} }
if(TheCamera.m_bUseTransitionBeta)
Beta = CGeneral::GetATanOfXY(-Cos(m_fTransitionBeta), -Sin(m_fTransitionBeta));
Front = CVector(Cos(Alpha) * Cos(Beta), Cos(Alpha) * Sin(Beta), Sin(Alpha)); Front = CVector(Cos(Alpha) * Cos(Beta), Cos(Alpha) * Sin(Beta), Sin(Alpha));
Source = TargetCoors - Front*CamDist; Source = TargetCoors - Front*CamDist;
TargetCoors.z -= BaseOffset; // now get back to the real target coors again TargetCoors.z -= BaseOffset; // now get back to the real target coors again

4
src/modelinfo/VehicleModelInfo.cpp
View File

@ -111,8 +111,8 @@ RwObjectNameIdAssocation heliIds[] = {
}; };
RwObjectNameIdAssocation planeIds[] = { RwObjectNameIdAssocation planeIds[] = {
{ "wheel_front_dummy", 2, 0 }, { "wheel_front_dummy", PLANE_WHEEL_FRONT, 0 },
{ "wheel_rear_dummy", 3, 0 }, { "wheel_rear_dummy", PLANE_WHEEL_READ, 0 },
{ "light_tailplane", PLANE_POS_LIGHT_TAIL, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, { "light_tailplane", PLANE_POS_LIGHT_TAIL, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
{ "light_left", PLANE_POS_LIGHT_LEFT, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, { "light_left", PLANE_POS_LIGHT_LEFT, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },
{ "light_right", PLANE_POS_LIGHT_RIGHT, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID }, { "light_right", PLANE_POS_LIGHT_RIGHT, VEHICLE_FLAG_POS | CLUMP_FLAG_NO_HIERID },

7
src/vehicles/Plane.h
View File

@ -2,6 +2,13 @@
#include "Vehicle.h" #include "Vehicle.h"
enum ePlaneNodes
{
PLANE_WHEEL_FRONT = 2,
PLANE_WHEEL_READ,
NUM_PLANE_NODES
};
enum ePlanePositions enum ePlanePositions
{ {
PLANE_POS_LIGHT_LEFT, PLANE_POS_LIGHT_LEFT,