game: Get camera code working (#965)

* cmake: disable edit&continue flags

* goos: make the build system work for alternate file paths nicely

* vs: update vs config

* vscode: extend terminal buffer!

* vs: fix presets

* debugger: fix exception handler

* game: add logo to application

* decomp: get `cam-master` to "work" -- manually changed return type

* debugger: fix printing issue

* game: get the camera actually working

* game: neutralize the analog sticks

* game: support analog sticks

* tests: update ref tests

* temp commit - inprogress stuff

* fix `send-macro`

* turn camera stuff back on, seems to work.  Still kernel-dispatch problem though

* address feedback

* formatting
This commit is contained in:
Tyler Wilding
2021-11-13 22:41:15 -05:00
committed by GitHub
parent d2f02600de
commit 44c43610ce
45 changed files with 10235 additions and 1332 deletions
+4 -4
View File
@@ -993,10 +993,10 @@
)
;; definition for function master-switch-to-entity
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 166]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 176]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 196]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 220]
;; Used lq/sq
(defbehavior master-switch-to-entity camera-master ((arg0 entity))
(local-vars
+2 -2
View File
@@ -4653,5 +4653,5 @@
)
)
;; definition for symbol *camera-base-mode*, type state
(define *camera-base-mode* (the-as state cam-string))
;; definition for symbol *camera-base-mode*, type (state camera-slave)
(define *camera-base-mode* cam-string)
+25 -23
View File
@@ -239,27 +239,29 @@
)
;; definition for function cam-state-from-entity
;; INFO: Return type mismatch (state camera-slave) vs state.
(defun cam-state-from-entity ((arg0 entity))
(let ((s5-0 (new 'stack 'curve)))
(cond
((not arg0)
(the-as state #f)
)
((res-lump-struct arg0 'pivot structure)
cam-circular
)
((res-lump-struct arg0 'align structure)
cam-standoff-read-entity
)
((get-curve-data! arg0 s5-0 'campath 'campath-k -1000000000.0)
cam-spline
)
((< 0.0 (cam-slave-get-float arg0 'stringMaxLength 0.0))
*camera-base-mode*
)
(else
cam-fixed-read-entity
)
(the-as state (cond
((not arg0)
(the-as (state camera-slave) #f)
)
((res-lump-struct arg0 'pivot structure)
cam-circular
)
((res-lump-struct arg0 'align structure)
cam-standoff-read-entity
)
((get-curve-data! arg0 s5-0 'campath 'campath-k -1000000000.0)
cam-spline
)
((< 0.0 (cam-slave-get-float arg0 'stringMaxLength 0.0))
*camera-base-mode*
)
(else
cam-fixed-read-entity
)
)
)
)
)
@@ -1273,10 +1275,10 @@
;; definition for function cam-standard-event-handler
;; INFO: Return type mismatch none vs object.
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 7]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 31]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 45]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 50]
;; Used lq/sq
(defbehavior
cam-standard-event-handler camera-slave
+3 -3
View File
@@ -1967,9 +1967,9 @@
)
;; definition for function anim-test-edit-sequence-list-handler
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 893]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 938]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 1045]
;; Used lq/sq
(defun anim-test-edit-sequence-list-handler ((arg0 int) (arg1 list-control))
(local-vars
+1 -1
View File
@@ -10,7 +10,7 @@
(define *dm-cam-mode-interpolation* (the-as debug-menu 0))
;; definition for function dm-cam-mode-func
(defun dm-cam-mode-func ((arg0 uint) (arg1 int))
(defun dm-cam-mode-func ((arg0 (state camera-slave)) (arg1 int))
(if (and (= arg1 4) arg0)
(send-event *camera* 'change-state arg0 *dm-cam-mode-interpolation*)
)
+7 -7
View File
@@ -290,13 +290,13 @@
;; definition for method 10 of type effect-control
;; INFO: Return type mismatch int vs object.
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 205]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 217]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 237]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 343]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 364]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 450]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 469]
;; Used lq/sq
(defmethod
dummy-10
+1 -1
View File
@@ -162,7 +162,7 @@
)
;; definition for method 9 of type game-info
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 191]
;; Used lq/sq
(defmethod
initialize!
+1 -1
View File
@@ -177,7 +177,7 @@
;; definition for function looping-code
;; INFO: Return type mismatch none vs symbol.
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 2]
(defun looping-code ()
(while #t
(suspend)
+2 -2
View File
@@ -186,8 +186,8 @@
;; definition for function ecoclaw-handler
;; INFO: Return type mismatch none vs object.
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 28]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 79]
;; Used lq/sq
(defbehavior
ecoclaw-handler ecoclaw
+1 -1
View File
@@ -281,7 +281,7 @@
;; definition for function baby-spider-default-event-handler
;; INFO: Return type mismatch none vs object.
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 7]
(defbehavior
baby-spider-default-event-handler baby-spider
((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
+1 -1
View File
@@ -83,7 +83,7 @@
;; definition for function swamp-rat-default-event-handler
;; INFO: Return type mismatch none vs object.
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 7]
(defbehavior
swamp-rat-default-event-handler swamp-rat
((arg0 process) (arg1 int) (arg2 symbol) (arg3 event-message-block))
+2 -2
View File
@@ -214,8 +214,8 @@
;; definition for function yakow-default-event-handler
;; INFO: Return type mismatch none vs object.
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 52]
;; WARN: rewrite_to_get_var got a none typed variable. Is there unreachable code?. [OP: 54]
(defbehavior
yakow-default-event-handler yakow
((arg0 process-drawable) (arg1 int) (arg2 symbol) (arg3 event-message-block))