summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-07-18 12:30:51 +0200
committerSergeanur <s.anureev@yandex.ua>2020-07-18 12:30:51 +0200
commit87eb96453a405bfa0fbfffb57c9d6cfc74acfb70 (patch)
tree3e91115fa0a99c22eb0293b5c4fec812eeaa11fc /src
parentActual fix now xD (diff)
downloadre3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.tar
re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.tar.gz
re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.tar.bz2
re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.tar.lz
re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.tar.xz
re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.tar.zst
re3-87eb96453a405bfa0fbfffb57c9d6cfc74acfb70.zip
Diffstat (limited to '')
-rw-r--r--src/animation/RpAnimBlend.cpp4
-rw-r--r--src/core/main.cpp7
-rw-r--r--src/rw/RwHelper.cpp8
3 files changed, 14 insertions, 5 deletions
diff --git a/src/animation/RpAnimBlend.cpp b/src/animation/RpAnimBlend.cpp
index 8671e95d..6739f56a 100644
--- a/src/animation/RpAnimBlend.cpp
+++ b/src/animation/RpAnimBlend.cpp
@@ -169,7 +169,11 @@ RpAnimBlendClumpInitSkinned(RpClump *clump)
for(i = 0; i < numBones; i++){
frames[i].nodeID = HIERNODEID(hier, i);
frames[i].resetPos = boneTab[i];
+#ifdef LIBRW
frames[i].hanimFrame = (RpHAnimStdKeyFrame*)rpHANIMHIERARCHYGETINTERPFRAME(hier, i);
+#else
+ frames[i].hanimFrame = (RpHAnimStdKeyFrame*)rtANIMGETINTERPFRAME(hier->currentAnim, i);
+#endif
}
clumpData->ForAllFrames(FrameInitCBskin, nil);
clumpData->frames[0].flag |= AnimBlendFrameData::VELOCITY_EXTRACTION;
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 7d8bdb5e..9083646d 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -303,7 +303,12 @@ PluginAttach(void)
return FALSE;
}
-
+#ifndef LIBRW
+ if (!RtAnimInitialize())
+ {
+ return FALSE;
+ }
+#endif
if( !RpHAnimPluginAttach() )
{
printf("Couldn't attach RpHAnim plugin\n");
diff --git a/src/rw/RwHelper.cpp b/src/rw/RwHelper.cpp
index e8a85be6..ab368e85 100644
--- a/src/rw/RwHelper.cpp
+++ b/src/rw/RwHelper.cpp
@@ -108,7 +108,7 @@ DefinedState(void)
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATESRCBLEND, (void*)rwBLENDSRCALPHA);
RwRenderStateSet(rwRENDERSTATEDESTBLEND, (void*)rwBLENDINVSRCALPHA);
- RwRenderStateSet(rwRENDERSTATEALPHAPRIMITIVEBUFFER, (void*)FALSE);
+ //RwRenderStateSet(rwRENDERSTATEALPHAPRIMITIVEBUFFER, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEBORDERCOLOR, (void*)RWRGBALONG(0, 0, 0, 255));
RwRenderStateSet(rwRENDERSTATEFOGENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEFOGCOLOR,
@@ -358,9 +358,9 @@ AtomicRemoveAnimFromSkinCB(RpAtomic *atomic, void *data)
hier->interpolator->currentAnim = nil;
}
#else
- if(hier && hier->pCurrentAnim){
- RpHAnimAnimationDestroy(hier->pCurrentAnim);
- hier->pCurrentAnim = nil;
+ if(hier && hier->currentAnim){
+ RpHAnimAnimationDestroy(hier->currentAnim->pCurrentAnim);
+ hier->currentAnim = nil;
}
#endif
}