Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

d/jak2: finish find-nearest | trajectory | editable-h and most of editable and editable-player #1847

Merged
merged 10 commits into from
Sep 10, 2022

Conversation

xTVaser
Copy link
Member

@xTVaser xTVaser commented Sep 6, 2022

Also made a first-pass of their SQL schema in preparation for getting that working.

Copy link
Collaborator

@water111 water111 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't look too closely at editable yet

decompiler/config/jak2/all-types.gc Outdated Show resolved Hide resolved
decompiler/config/jak2/stack_structures.jsonc Show resolved Hide resolved
goal_src/jak1/dgos/engine.gd Show resolved Hide resolved
goal_src/jak2/engine/camera/cam-debug.gc Outdated Show resolved Hide resolved
goal_src/jak2/engine/camera/cam-debug.gc Show resolved Hide resolved
goal_src/jak2/engine/camera/cam-states.gc Outdated Show resolved Hide resolved
goal_src/jak2/engine/debug/editable-h.gc Outdated Show resolved Hide resolved
(let ((v0-3 (cons gp-1 (-> (the-as editable-plane (+ (* s4-0 4) (the-as int gp-1))) vertex 0 owner)))
(v1-10 (l.wu (+ (* s4-0 4) (the-as int gp-1) 28)))
)
(s.w! (+ v1-10 16) v0-3)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI these s.w!s and l.wu's compile now, but we should eventually fix these (don't worry about it here, there's still other todos for this file so it can wait)

goal_src/jak2/engine/physics/trajectory.gc Outdated Show resolved Hide resolved
(else
(let ((s1-0 (new 'stack-no-clear 'sphere))
(s2-1 ((method-of-type array new)
(the-as symbol (new 'stack-no-clear 'array 'collide-shape 32))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I remember this working better in jak 1 but I could be wrong... I'll check more later.

@water111 water111 merged commit 81b6d5f into open-goal:master Sep 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants