mirror of
https://github.com/open-goal/jak-project.git
synced 2024-10-20 21:27:52 -04:00
45318be063
* decomp: mostly finish `cam-master` * decomp/scripts: lots of work in cam-states * stash * Merge remote-tracking branch 'water111/master' into decomp/camera-master Updated submodule third-party/googletest * decompiler: Add support for non power of 2 offsets for inline arr access * decomp: mostly finish `cam-states` need to fix a macro issue * blocked: `cam-master` decompiler crash when adding casts * decomp: finish `cam-states-dbg` * decomp: mostly finish `pov-camera` with the exception of joint-related code * decomp: `cam-debug` finished decompiling, no way does this compile yet though * decomp: considerable work done in `cam-layout` * decomp: `cam-layout` almost done! * decomp: `pov-camera` finished, TC tests will fail for now * decomp: working on resolving issues * decomp: cam-layout decompiling * fixing more issues in cam-master...one event handler remains * skip problematic function in `cam-master` for now * gsrc: update res macros * decomp: finish `cam-states` * decomp: giving up on `cam-debug` * tests: allow skipping state handlers in ref tests * decomp: working through cam-layout bugs * decomp: allow for shifting non-integers * decomp: finalize `cam-layout` and `cam-master` * decomp: finalize `cam-states` * cleanup: bi-annual formatting of the casting files * formatting * address feedback - leave the float labels alone for now * address feedback * linting/formatting * update gsrc and ref tests Co-authored-by: ManDude <7569514+ManDude@users.noreply.github.com>
164 lines
4.4 KiB
Common Lisp
164 lines
4.4 KiB
Common Lisp
;;-*-Lisp-*-
|
|
(in-package goal)
|
|
|
|
;; name: vol-h.gc
|
|
;; name in dgo: vol-h
|
|
;; dgos: GAME, ENGINE
|
|
|
|
;; definition of type plane-volume
|
|
(deftype plane-volume (structure)
|
|
((volume-type symbol :offset-assert 0)
|
|
(point-count int16 :offset-assert 4)
|
|
(normal-count int16 :offset-assert 6)
|
|
(first-point vector :offset-assert 8)
|
|
(first-normal vector :offset-assert 12)
|
|
(num-planes int32 :offset-assert 16)
|
|
(plane uint32 :offset-assert 20)
|
|
)
|
|
:pack-me
|
|
:method-count-assert 12
|
|
:size-assert #x18
|
|
:flag-assert #xc00000018
|
|
(:methods
|
|
(dummy-9 () none 9)
|
|
(dummy-10 () none 10)
|
|
(dummy-11 () none 11)
|
|
)
|
|
)
|
|
|
|
;; definition of type vol-control
|
|
(deftype vol-control (basic)
|
|
((flags uint32 :offset-assert 4)
|
|
(process process-drawable :offset-assert 8)
|
|
(pos-vol-count int32 :offset-assert 12)
|
|
(pos-vol plane-volume 32 :inline :offset-assert 16)
|
|
(neg-vol-count int32 :offset-assert 784)
|
|
(neg-vol plane-volume 32 :inline :offset-assert 788)
|
|
(debug-point basic :offset-assert 1556)
|
|
(debug-normal basic :offset-assert 1560)
|
|
)
|
|
:method-count-assert 12
|
|
:size-assert #x61c
|
|
:flag-assert #xc0000061c
|
|
(:methods
|
|
(new (symbol type process-drawable) _type_ 0)
|
|
(dummy-9 () none 9)
|
|
(dummy-10 () none 10)
|
|
(TODO-RENAME-11 (_type_) symbol 11)
|
|
)
|
|
)
|
|
|
|
;; definition for method 0 of type vol-control
|
|
;; INFO: Return type mismatch object vs vol-control.
|
|
;; Used lq/sq
|
|
(defmethod new vol-control ((allocation symbol) (type-to-make type) (arg0 process-drawable))
|
|
(let ((gp-0 (the-as object (object-new allocation type-to-make (the-as int (-> type-to-make size))))))
|
|
(when (zero? (the-as vol-control gp-0))
|
|
(go process-drawable-art-error "memory")
|
|
(set! gp-0 0)
|
|
(goto cfg-13)
|
|
)
|
|
(set! (-> (the-as vol-control gp-0) process) arg0)
|
|
(let* ((s5-1 (the-as res-lump (-> (the-as vol-control gp-0) process entity)))
|
|
(s4-0
|
|
(->
|
|
((method-of-type res-lump lookup-tag-idx)
|
|
(the-as entity s5-1)
|
|
'vol
|
|
'exact
|
|
0.0
|
|
)
|
|
lo
|
|
)
|
|
)
|
|
)
|
|
(when (>= (the-as int s4-0) 0)
|
|
(let ((s3-0 (the-as uint s4-0))
|
|
(s2-0 (-> s5-1 tag s4-0))
|
|
)
|
|
0
|
|
(while (= (-> s2-0 name) (-> s5-1 tag s4-0 name))
|
|
(let
|
|
((v1-12
|
|
(make-property-data
|
|
s5-1
|
|
0.0
|
|
(the-as res-tag-pair s3-0)
|
|
(the-as pointer #f)
|
|
)
|
|
)
|
|
(a0-8
|
|
(->
|
|
(the-as vol-control gp-0)
|
|
pos-vol
|
|
(-> (the-as vol-control gp-0) pos-vol-count)
|
|
)
|
|
)
|
|
)
|
|
(set! (-> a0-8 num-planes) (the-as int (-> s2-0 elt-count)))
|
|
(set! (-> a0-8 plane) (the-as uint v1-12))
|
|
)
|
|
(+! (-> (the-as vol-control gp-0) pos-vol-count) 1)
|
|
(+! s3-0 1)
|
|
(set! s2-0 (-> s5-1 tag s3-0))
|
|
)
|
|
)
|
|
)
|
|
)
|
|
(let* ((s5-2 (the-as res-lump (-> (the-as vol-control gp-0) process entity)))
|
|
(s4-1
|
|
(->
|
|
((method-of-type res-lump lookup-tag-idx)
|
|
(the-as entity s5-2)
|
|
'cutoutvol
|
|
'exact
|
|
0.0
|
|
)
|
|
lo
|
|
)
|
|
)
|
|
)
|
|
(when (>= (the-as int s4-1) 0)
|
|
(let ((s3-1 (the-as uint s4-1))
|
|
(s2-1 (-> s5-2 tag s4-1))
|
|
)
|
|
0
|
|
(while (= (-> s2-1 name) (-> s5-2 tag s4-1 name))
|
|
(let
|
|
((v1-31
|
|
(make-property-data
|
|
s5-2
|
|
0.0
|
|
(the-as res-tag-pair s3-1)
|
|
(the-as pointer #f)
|
|
)
|
|
)
|
|
(a0-19
|
|
(->
|
|
(the-as vol-control gp-0)
|
|
neg-vol
|
|
(-> (the-as vol-control gp-0) neg-vol-count)
|
|
)
|
|
)
|
|
)
|
|
(set! (-> a0-19 num-planes) (the-as int (-> s2-1 elt-count)))
|
|
(set! (-> a0-19 plane) (the-as uint v1-31))
|
|
)
|
|
(+! (-> (the-as vol-control gp-0) neg-vol-count) 1)
|
|
(+! s3-1 1)
|
|
(set! s2-1 (-> s5-2 tag s3-1))
|
|
)
|
|
)
|
|
)
|
|
)
|
|
(label cfg-13)
|
|
(the-as vol-control gp-0)
|
|
)
|
|
)
|
|
|
|
|
|
;; definition for method 11 of type vol-control
|
|
(defmethod TODO-RENAME-11 vol-control ((obj vol-control))
|
|
(and *display-vol-marks* (logtest? (-> obj flags) 1))
|
|
)
|