Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix a bug with cutscene triggers

Browse source 
fix some animation bugs
This commit is contained in:
James Lambert 2023-01-01 21:14:32 -07:00
parent 058ad8fd98
commit c000fd60cb
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.c
View file

@ -158,7 +158,7 @@ static void gameProc(void* arg) {
dynamicSceneInit();
contactSolverInit(&gContactSolver);
portalSurfaceCleanupQueueInit();
levelLoad(3);
levelLoad(1);
cutsceneRunnerReset();
controllersInit();
initAudio(fps);

10
src/sk64/skelatool_animator.c
View file

@ -160,7 +160,7 @@ int skAnimatorBoneStateIndexOfFrame(struct SKAnimator* animator, int frame) {
return 1;
}
return 0;
return -1;
}
void skAnimatorStep(struct SKAnimator* animator, float deltaTime) {
@ -183,6 +183,14 @@ void skAnimatorStep(struct SKAnimator* animator, float deltaTime) {
int nextFrame = (int)ceilf(currentFrameFractional);
float lerpValue = currentFrameFractional - prevFrame;
if (nextFrame >= currentClip->nFrames) {
nextFrame -= currentClip->nFrames;
}
if (nextFrame == prevFrame) {
lerpValue = 1.0f;
}
int existingPrevFrame = skAnimatorBoneStateIndexOfFrame(animator, prevFrame);
int existingNextFrame = skAnimatorBoneStateIndexOfFrame(animator, nextFrame);

4
tools/level_scripts/static_export.lua
View file

@ -35,10 +35,6 @@ local function proccessStaticNodes(nodes)
mesh_bb.max.x = math.floor(mesh_bb.max.x + 0.5)
mesh_bb.max.y = math.floor(mesh_bb.max.y + 0.5)
mesh_bb.max.z = math.floor(mesh_bb.max.z + 0.5)
if v.node.name == '@static floor.005' then
print(mesh_bb)
end
table.insert(result, {
node = v.node,

1
tools/level_scripts/trigger.lua
View file

@ -279,6 +279,7 @@ local function generate_cutscenes()
table.insert(cutscenes_result, {
name = cutscene.name,
steps = steps,
macro = cutscene.macro,
})
table.insert(cutscene_data, {