mirror of
https://github.com/open-goal/jak-project
synced 2026-09-01 09:53:12 -04:00
Merge branch 'master' of https://github.com/water111/jak-project into w/dma-for-font
This commit is contained in:
water
@@ -23319,37 +23319,40 @@
|
||||
|
||||
;; - Types
|
||||
|
||||
; (deftype twist-joint (structure)
|
||||
; ((ry float :offset-assert 0)
|
||||
; (max-dry float :offset-assert 4)
|
||||
; )
|
||||
; :method-count-assert 9
|
||||
; :size-assert #x8
|
||||
; :flag-assert #x900000008
|
||||
; )
|
||||
(deftype twist-joint (structure)
|
||||
((ry float :offset-assert 0)
|
||||
(max-dry float :offset-assert 4)
|
||||
)
|
||||
:allow-misaligned
|
||||
:method-count-assert 9
|
||||
:size-assert #x8
|
||||
:flag-assert #x900000008
|
||||
)
|
||||
|
||||
; (deftype twister (basic)
|
||||
; ((num-joints int32 :offset-assert 4)
|
||||
; (first-joint int32 :offset-assert 8)
|
||||
; (last-joint int32 :offset-assert 12)
|
||||
; (max-speed float :offset-assert 16)
|
||||
; (smoothing float :offset-assert 20)
|
||||
; (min-dist float :offset-assert 24)
|
||||
; (target float :offset-assert 28)
|
||||
; (ry float :offset-assert 32)
|
||||
; (max-speed-ry float :offset-assert 36)
|
||||
; (data UNKNOWN :dynamic :offset-assert 40)
|
||||
; )
|
||||
; :method-count-assert 13
|
||||
; :size-assert #x28
|
||||
; :flag-assert #xd00000028
|
||||
; (:methods
|
||||
; (dummy-9 () none 9)
|
||||
; (dummy-10 () none 10)
|
||||
; (dummy-11 () none 11)
|
||||
; (dummy-12 () none 12)
|
||||
; )
|
||||
; )
|
||||
(deftype twister (basic)
|
||||
((num-joints int32 :offset-assert 4)
|
||||
(first-joint int32 :offset-assert 8)
|
||||
(last-joint int32 :offset-assert 12)
|
||||
(something uint16 :offset 12)
|
||||
(max-speed float :offset-assert 16)
|
||||
(smoothing float :offset-assert 20)
|
||||
(min-dist float :offset-assert 24)
|
||||
(target float :offset-assert 28)
|
||||
(ry float :offset-assert 32)
|
||||
(max-speed-ry float :offset-assert 36)
|
||||
(data twist-joint :inline :dynamic :offset-assert 40)
|
||||
)
|
||||
:method-count-assert 13
|
||||
:size-assert #x28
|
||||
:flag-assert #xd00000028
|
||||
(:methods
|
||||
(new (symbol _type_ int int float float float float) _type_ 0)
|
||||
(TODO-RENAME-9 (_type_ int int float) none 9)
|
||||
(set-target! (_type_ float) none 10)
|
||||
(TODO-RENAME-11 (_type_) none 11)
|
||||
(TODO-RENAME-12 (_type_ process-drawable) none 12)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
;; ----------------------
|
||||
|
||||
@@ -1429,7 +1429,6 @@
|
||||
["L497", "float", true],
|
||||
["L508", "float", true]
|
||||
],
|
||||
|
||||
"shadow": [
|
||||
["L23", "sparticle-launcher", true],
|
||||
["L26", "float", true],
|
||||
@@ -1450,6 +1449,9 @@
|
||||
"wobbler": [
|
||||
["L6", "float", true]
|
||||
],
|
||||
"twister": [
|
||||
["L20", "float", true]
|
||||
],
|
||||
"title-obs": [["L499", "float", true]],
|
||||
|
||||
"drawable": [
|
||||
|
||||
@@ -855,6 +855,8 @@
|
||||
"draw-string-xy": [
|
||||
[16, "font-context"]
|
||||
],
|
||||
|
||||
"(method 12 twister)": [
|
||||
[16, "matrix"]
|
||||
],
|
||||
"placeholder-do-not-add-below!": []
|
||||
}
|
||||
|
||||
@@ -1864,6 +1864,17 @@
|
||||
[[78, 79], "a0", "dma-packet"],
|
||||
[79, "a0", "(pointer uint64)"]
|
||||
],
|
||||
|
||||
"(method 11 twister)": [
|
||||
[7, "s4", "twist-joint"],
|
||||
[13, "s4", "twist-joint"],
|
||||
[26, "s4", "twist-joint"],
|
||||
[28, "s4", "twist-joint"],
|
||||
[36, "s4", "twist-joint"],
|
||||
[40, "s4", "twist-joint"],
|
||||
[47, "s4", "twist-joint"],
|
||||
[55, "s4", "twist-joint"],
|
||||
[70, "s4", "twist-joint"],
|
||||
[82, "s4", "twist-joint"]
|
||||
],
|
||||
"placeholder-do-not-add-below": []
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
"jak1": {
|
||||
"fileProgress": {
|
||||
"src_files_total": 514,
|
||||
"src_files_finished": 54,
|
||||
"src_files_finished": 55,
|
||||
"src_files_started": 177,
|
||||
"data_files_total": 584,
|
||||
"data_files_started": 4
|
||||
|
||||
@@ -178,7 +178,7 @@ export default {
|
||||
const numPRs = 9;
|
||||
for (var i = 0; i < numPRs; i++) {
|
||||
var pr = data.items[i];
|
||||
if (pr.body.length == 0) {
|
||||
if (pr,body == null || pr.body.length == 0) {
|
||||
pr.body = "No Description";
|
||||
}
|
||||
pr.body = this.truncateString(pr.body, 250);
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/jak-project/favicon.png"><title>OpenGOAL Tooling</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="/jak-project/css/about.bf16c6ab.css" rel="prefetch"><link href="/jak-project/js/about.035bad88.js" rel="prefetch"><link href="/jak-project/css/chunk-vendors.b018c88a.css" rel="preload" as="style"><link href="/jak-project/js/app.caccaa88.js" rel="preload" as="script"><link href="/jak-project/js/chunk-vendors.874e560a.js" rel="preload" as="script"><link href="/jak-project/css/chunk-vendors.b018c88a.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but docs-and-tooling doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/jak-project/js/chunk-vendors.874e560a.js"></script><script src="/jak-project/js/app.caccaa88.js"></script></body></html>
|
||||
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="/jak-project/favicon.png"><title>OpenGOAL Tooling</title><link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900"><link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css"><link href="/jak-project/css/about.bf16c6ab.css" rel="prefetch"><link href="/jak-project/js/about.e560ddd1.js" rel="prefetch"><link href="/jak-project/css/chunk-vendors.b018c88a.css" rel="preload" as="style"><link href="/jak-project/js/app.b9111cd5.js" rel="preload" as="script"><link href="/jak-project/js/chunk-vendors.874e560a.js" rel="preload" as="script"><link href="/jak-project/css/chunk-vendors.b018c88a.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but docs-and-tooling doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/jak-project/js/chunk-vendors.874e560a.js"></script><script src="/jak-project/js/app.b9111cd5.js"></script></body></html>
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -1,2 +1,2 @@
|
||||
(function(e){function t(t){for(var n,o,i=t[0],c=t[1],l=t[2],s=0,p=[];s<i.length;s++)o=i[s],Object.prototype.hasOwnProperty.call(a,o)&&a[o]&&p.push(a[o][0]),a[o]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);f&&f(t);while(p.length)p.shift()();return u.push.apply(u,l||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,o=1;o<r.length;o++){var i=r[o];0!==a[i]&&(n=!1)}n&&(u.splice(t--,1),e=c(c.s=r[0]))}return e}var n={},o={app:0},a={app:0},u=[];function i(e){return c.p+"js/"+({about:"about"}[e]||e)+"."+{about:"035bad88"}[e]+".js"}function c(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,c),r.l=!0,r.exports}c.e=function(e){var t=[],r={about:1};o[e]?t.push(o[e]):0!==o[e]&&r[e]&&t.push(o[e]=new Promise((function(t,r){for(var n="css/"+({about:"about"}[e]||e)+"."+{about:"bf16c6ab"}[e]+".css",a=c.p+n,u=document.getElementsByTagName("link"),i=0;i<u.length;i++){var l=u[i],s=l.getAttribute("data-href")||l.getAttribute("href");if("stylesheet"===l.rel&&(s===n||s===a))return t()}var p=document.getElementsByTagName("style");for(i=0;i<p.length;i++){l=p[i],s=l.getAttribute("data-href");if(s===n||s===a)return t()}var f=document.createElement("link");f.rel="stylesheet",f.type="text/css",f.onload=t,f.onerror=function(t){var n=t&&t.target&&t.target.src||a,u=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");u.code="CSS_CHUNK_LOAD_FAILED",u.request=n,delete o[e],f.parentNode.removeChild(f),r(u)},f.href=a;var d=document.getElementsByTagName("head")[0];d.appendChild(f)})).then((function(){o[e]=0})));var n=a[e];if(0!==n)if(n)t.push(n[2]);else{var u=new Promise((function(t,r){n=a[e]=[t,r]}));t.push(n[2]=u);var l,s=document.createElement("script");s.charset="utf-8",s.timeout=120,c.nc&&s.setAttribute("nonce",c.nc),s.src=i(e);var p=new Error;l=function(t){s.onerror=s.onload=null,clearTimeout(f);var r=a[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),o=t&&t.target&&t.target.src;p.message="Loading chunk "+e+" failed.\n("+n+": "+o+")",p.name="ChunkLoadError",p.type=n,p.request=o,r[1](p)}a[e]=void 0}};var f=setTimeout((function(){l({type:"timeout",target:s})}),12e4);s.onerror=s.onload=l,document.head.appendChild(s)}return Promise.all(t)},c.m=e,c.c=n,c.d=function(e,t,r){c.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},c.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},c.t=function(e,t){if(1&t&&(e=c(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(c.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)c.d(r,n,function(t){return e[t]}.bind(null,n));return r},c.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return c.d(t,"a",t),t},c.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},c.p="/jak-project/",c.oe=function(e){throw console.error(e),e};var l=window["webpackJsonp"]=window["webpackJsonp"]||[],s=l.push.bind(l);l.push=t,l=l.slice();for(var p=0;p<l.length;p++)t(l[p]);var f=s;u.push([0,"chunk-vendors"]),r()})({0:function(e,t,r){e.exports=r("56d7")},"56d7":function(e,t,r){"use strict";r.r(t);r("e260"),r("e6cf"),r("cca6"),r("a79d");var n=r("2b0e"),o=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("v-app",[r("v-main",[r("router-view")],1)],1)},a=[],u={name:"App",components:{},data:function(){return{}}},i=u,c=r("2877"),l=r("6544"),s=r.n(l),p=r("7496"),f=r("f6c4"),d=Object(c["a"])(i,o,a,!1,null,null,null),h=d.exports;s()(d,{VApp:p["a"],VMain:f["a"]});var b=r("f309");n["a"].use(b["a"]);var m=new b["a"]({theme:{dark:!0}}),v=(r("d3b7"),r("3ca3"),r("ddb0"),r("8c4f"));n["a"].use(v["a"]);var g=[{path:"/",name:"Home",component:function(){return r.e("about").then(r.bind(null,"bb51"))}}],y=new v["a"]({mode:"history",base:"/jak-project/",routes:g}),w=y;n["a"].config.productionTip=!1,new n["a"]({vuetify:m,router:w,render:function(e){return e(h)}}).$mount("#app")}});
|
||||
//# sourceMappingURL=app.caccaa88.js.map
|
||||
(function(e){function t(t){for(var n,o,i=t[0],c=t[1],l=t[2],s=0,p=[];s<i.length;s++)o=i[s],Object.prototype.hasOwnProperty.call(a,o)&&a[o]&&p.push(a[o][0]),a[o]=0;for(n in c)Object.prototype.hasOwnProperty.call(c,n)&&(e[n]=c[n]);f&&f(t);while(p.length)p.shift()();return u.push.apply(u,l||[]),r()}function r(){for(var e,t=0;t<u.length;t++){for(var r=u[t],n=!0,o=1;o<r.length;o++){var i=r[o];0!==a[i]&&(n=!1)}n&&(u.splice(t--,1),e=c(c.s=r[0]))}return e}var n={},o={app:0},a={app:0},u=[];function i(e){return c.p+"js/"+({about:"about"}[e]||e)+"."+{about:"e560ddd1"}[e]+".js"}function c(t){if(n[t])return n[t].exports;var r=n[t]={i:t,l:!1,exports:{}};return e[t].call(r.exports,r,r.exports,c),r.l=!0,r.exports}c.e=function(e){var t=[],r={about:1};o[e]?t.push(o[e]):0!==o[e]&&r[e]&&t.push(o[e]=new Promise((function(t,r){for(var n="css/"+({about:"about"}[e]||e)+"."+{about:"bf16c6ab"}[e]+".css",a=c.p+n,u=document.getElementsByTagName("link"),i=0;i<u.length;i++){var l=u[i],s=l.getAttribute("data-href")||l.getAttribute("href");if("stylesheet"===l.rel&&(s===n||s===a))return t()}var p=document.getElementsByTagName("style");for(i=0;i<p.length;i++){l=p[i],s=l.getAttribute("data-href");if(s===n||s===a)return t()}var f=document.createElement("link");f.rel="stylesheet",f.type="text/css",f.onload=t,f.onerror=function(t){var n=t&&t.target&&t.target.src||a,u=new Error("Loading CSS chunk "+e+" failed.\n("+n+")");u.code="CSS_CHUNK_LOAD_FAILED",u.request=n,delete o[e],f.parentNode.removeChild(f),r(u)},f.href=a;var d=document.getElementsByTagName("head")[0];d.appendChild(f)})).then((function(){o[e]=0})));var n=a[e];if(0!==n)if(n)t.push(n[2]);else{var u=new Promise((function(t,r){n=a[e]=[t,r]}));t.push(n[2]=u);var l,s=document.createElement("script");s.charset="utf-8",s.timeout=120,c.nc&&s.setAttribute("nonce",c.nc),s.src=i(e);var p=new Error;l=function(t){s.onerror=s.onload=null,clearTimeout(f);var r=a[e];if(0!==r){if(r){var n=t&&("load"===t.type?"missing":t.type),o=t&&t.target&&t.target.src;p.message="Loading chunk "+e+" failed.\n("+n+": "+o+")",p.name="ChunkLoadError",p.type=n,p.request=o,r[1](p)}a[e]=void 0}};var f=setTimeout((function(){l({type:"timeout",target:s})}),12e4);s.onerror=s.onload=l,document.head.appendChild(s)}return Promise.all(t)},c.m=e,c.c=n,c.d=function(e,t,r){c.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},c.r=function(e){"undefined"!==typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},c.t=function(e,t){if(1&t&&(e=c(e)),8&t)return e;if(4&t&&"object"===typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(c.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var n in e)c.d(r,n,function(t){return e[t]}.bind(null,n));return r},c.n=function(e){var t=e&&e.__esModule?function(){return e["default"]}:function(){return e};return c.d(t,"a",t),t},c.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},c.p="/jak-project/",c.oe=function(e){throw console.error(e),e};var l=window["webpackJsonp"]=window["webpackJsonp"]||[],s=l.push.bind(l);l.push=t,l=l.slice();for(var p=0;p<l.length;p++)t(l[p]);var f=s;u.push([0,"chunk-vendors"]),r()})({0:function(e,t,r){e.exports=r("56d7")},"56d7":function(e,t,r){"use strict";r.r(t);r("e260"),r("e6cf"),r("cca6"),r("a79d");var n=r("2b0e"),o=function(){var e=this,t=e.$createElement,r=e._self._c||t;return r("v-app",[r("v-main",[r("router-view")],1)],1)},a=[],u={name:"App",components:{},data:function(){return{}}},i=u,c=r("2877"),l=r("6544"),s=r.n(l),p=r("7496"),f=r("f6c4"),d=Object(c["a"])(i,o,a,!1,null,null,null),h=d.exports;s()(d,{VApp:p["a"],VMain:f["a"]});var m=r("f309");n["a"].use(m["a"]);var v=new m["a"]({theme:{dark:!0}}),b=(r("d3b7"),r("3ca3"),r("ddb0"),r("8c4f"));n["a"].use(b["a"]);var g=[{path:"/",name:"Home",component:function(){return r.e("about").then(r.bind(null,"bb51"))}}],y=new b["a"]({mode:"history",base:"/jak-project/",routes:g}),w=y;n["a"].config.productionTip=!1,new n["a"]({vuetify:v,router:w,render:function(e){return e(h)}}).$mount("#app")}});
|
||||
//# sourceMappingURL=app.b9111cd5.js.map
|
||||
File diff suppressed because one or more lines are too long
@@ -5,3 +5,194 @@
|
||||
;; name in dgo: twister
|
||||
;; dgos: BEA, L1
|
||||
|
||||
;; definition of type twist-joint
|
||||
(deftype twist-joint (structure)
|
||||
((ry float :offset-assert 0)
|
||||
(max-dry float :offset-assert 4)
|
||||
)
|
||||
:allow-misaligned :method-count-assert 9
|
||||
:size-assert #x8
|
||||
:flag-assert #x900000008
|
||||
)
|
||||
|
||||
;; definition of type twister
|
||||
(deftype twister (basic)
|
||||
((num-joints int32 :offset-assert 4)
|
||||
(first-joint int32 :offset-assert 8)
|
||||
(last-joint int32 :offset-assert 12)
|
||||
(something uint16 :offset 12)
|
||||
(max-speed float :offset-assert 16)
|
||||
(smoothing float :offset-assert 20)
|
||||
(min-dist float :offset-assert 24)
|
||||
(target float :offset-assert 28)
|
||||
(ry float :offset-assert 32)
|
||||
(max-speed-ry float :offset-assert 36)
|
||||
(data twist-joint :inline :dynamic :offset-assert 40)
|
||||
)
|
||||
:method-count-assert 13
|
||||
:size-assert #x28
|
||||
:flag-assert #xd00000028
|
||||
(:methods
|
||||
(new (symbol _type_ int int float float float float) _type_ 0)
|
||||
(TODO-RENAME-9 (_type_ int int float) none 9)
|
||||
(set-target! (_type_ float) none 10)
|
||||
(TODO-RENAME-11 (_type_) none 11)
|
||||
(TODO-RENAME-12 (_type_ process-drawable) none 12)
|
||||
)
|
||||
)
|
||||
|
||||
;; definition for method 0 of type twister
|
||||
(defmethod
|
||||
new
|
||||
twister
|
||||
((allocation symbol)
|
||||
(type-to-make twister)
|
||||
(arg0 int)
|
||||
(arg1 int)
|
||||
(arg2 float)
|
||||
(arg3 float)
|
||||
(arg4 float)
|
||||
(arg5 float)
|
||||
)
|
||||
(let* ((gp-0 (+ (- 1 arg0) arg1))
|
||||
(v0-0
|
||||
(object-new
|
||||
allocation
|
||||
(the-as type type-to-make)
|
||||
(the-as int (+ (-> type-to-make something) (* gp-0 16)))
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! (-> v0-0 first-joint) arg0)
|
||||
(set! (-> v0-0 last-joint) arg1)
|
||||
(set! (-> v0-0 num-joints) gp-0)
|
||||
(set! (-> v0-0 max-speed) arg2)
|
||||
(set! (-> v0-0 smoothing) arg4)
|
||||
(set! (-> v0-0 min-dist) arg5)
|
||||
(set! (-> v0-0 target) 0.0)
|
||||
(set! (-> v0-0 ry) 0.0)
|
||||
(set! (-> v0-0 max-speed-ry) arg3)
|
||||
(dotimes (v1-4 gp-0)
|
||||
(set! (-> v0-0 data v1-4 ry) 0.0)
|
||||
(set! (-> v0-0 data v1-4 max-dry) 0.0)
|
||||
)
|
||||
v0-0
|
||||
)
|
||||
)
|
||||
|
||||
;; definition for method 5 of type twister
|
||||
(defmethod asize-of twister ((obj twister))
|
||||
(+ (* (-> obj num-joints) 16) 40)
|
||||
)
|
||||
|
||||
;; definition for method 9 of type twister
|
||||
;; INFO: Return type mismatch int vs none.
|
||||
(defmethod
|
||||
TODO-RENAME-9
|
||||
twister
|
||||
((obj twister) (arg0 int) (arg1 int) (arg2 float))
|
||||
(let ((v1-1 (- arg0 (-> obj first-joint)))
|
||||
(a1-2 (- arg1 (-> obj first-joint)))
|
||||
)
|
||||
(while (>= a1-2 v1-1)
|
||||
(set! (-> obj data v1-1 max-dry) arg2)
|
||||
(+! v1-1 1)
|
||||
)
|
||||
)
|
||||
0
|
||||
(none)
|
||||
)
|
||||
|
||||
;; definition for method 10 of type twister
|
||||
;; INFO: Return type mismatch int vs none.
|
||||
(defmethod set-target! twister ((obj twister) (arg0 float))
|
||||
(set! (-> obj target) arg0)
|
||||
0
|
||||
(none)
|
||||
)
|
||||
|
||||
;; definition for method 11 of type twister
|
||||
;; INFO: Return type mismatch int vs none.
|
||||
(defmethod TODO-RENAME-11 twister ((obj twister))
|
||||
(let* ((s5-0 (+ (-> obj num-joints) -1))
|
||||
(s4-0 (-> obj data s5-0))
|
||||
)
|
||||
(let ((f0-2 (deg-diff (-> s4-0 ry) (-> obj target))))
|
||||
(+!
|
||||
(-> s4-0 ry)
|
||||
(seek-with-smooth
|
||||
0.0
|
||||
f0-2
|
||||
(-> obj max-speed)
|
||||
(-> obj smoothing)
|
||||
(-> obj min-dist)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((f30-1 (-> s4-0 ry)))
|
||||
(while (> s5-0 0)
|
||||
(+! s5-0 -1)
|
||||
(let ((s4-1 (-> obj data s5-0)))
|
||||
(let ((f0-9 (deg-diff f30-1 (-> s4-1 ry))))
|
||||
(cond
|
||||
((= (-> s4-1 max-dry) 0.0)
|
||||
(set! f0-9 0.0)
|
||||
)
|
||||
((< (fabs f0-9) (-> s4-1 max-dry))
|
||||
)
|
||||
((< f0-9 0.0)
|
||||
(set!
|
||||
f0-9
|
||||
(seek-with-smooth
|
||||
f0-9
|
||||
(- (-> s4-1 max-dry))
|
||||
(-> obj max-speed)
|
||||
(-> obj smoothing)
|
||||
(-> obj min-dist)
|
||||
)
|
||||
)
|
||||
)
|
||||
(else
|
||||
(set!
|
||||
f0-9
|
||||
(seek-with-smooth
|
||||
f0-9
|
||||
(-> s4-1 max-dry)
|
||||
(-> obj max-speed)
|
||||
(-> obj smoothing)
|
||||
(-> obj min-dist)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(+! f30-1 f0-9)
|
||||
)
|
||||
(set! (-> s4-1 ry) f30-1)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
0
|
||||
(none)
|
||||
)
|
||||
|
||||
;; definition for method 12 of type twister
|
||||
;; INFO: Return type mismatch int vs none.
|
||||
(defmethod TODO-RENAME-12 twister ((obj twister) (arg0 process-drawable))
|
||||
(let ((s4-0 (new 'stack-no-clear 'matrix)))
|
||||
(dotimes (s3-0 (-> obj num-joints))
|
||||
(let
|
||||
((s2-0
|
||||
(-> arg0 node-list data (+ (-> obj first-joint) s3-0) bone transform)
|
||||
)
|
||||
)
|
||||
(matrix-rotate-y! s4-0 (-> obj data s3-0 ry))
|
||||
(vector-! (-> s2-0 vector 3) (-> s2-0 vector 3) (-> arg0 root trans))
|
||||
(matrix*! s2-0 s2-0 s4-0)
|
||||
(vector+! (-> s2-0 vector 3) (-> s2-0 vector 3) (-> arg0 root trans))
|
||||
)
|
||||
)
|
||||
)
|
||||
0
|
||||
(none)
|
||||
)
|
||||
|
||||
@@ -161,7 +161,7 @@
|
||||
(if (!= arg2 0.0)
|
||||
(compute-and-draw-shadow
|
||||
s2-0
|
||||
(-> s4-0 position)
|
||||
(-> s4-0 transform vector 3)
|
||||
(-> s4-0 scale)
|
||||
(the-as vector arg2)
|
||||
arg6
|
||||
@@ -169,7 +169,7 @@
|
||||
)
|
||||
)
|
||||
(if (and arg1 (!= (shr (shl (-> s4-0 cache bone-matrix) 52) 58) 3))
|
||||
(set! (-> arg1 quad) (-> s4-0 position quad))
|
||||
(set! (-> arg1 quad) (-> s4-0 transform vector 3 quad))
|
||||
)
|
||||
)
|
||||
(else
|
||||
@@ -337,7 +337,3 @@
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,222 @@
|
||||
;;-*-Lisp-*-
|
||||
(in-package goal)
|
||||
|
||||
;; definition of type twist-joint
|
||||
(deftype twist-joint (structure)
|
||||
((ry float :offset-assert 0)
|
||||
(max-dry float :offset-assert 4)
|
||||
)
|
||||
:allow-misaligned :method-count-assert 9
|
||||
:size-assert #x8
|
||||
:flag-assert #x900000008
|
||||
)
|
||||
|
||||
;; definition for method 3 of type twist-joint
|
||||
(defmethod inspect twist-joint ((obj twist-joint))
|
||||
(format #t "[~8x] ~A~%" obj 'twist-joint)
|
||||
(format #t "~Try: ~f~%" (-> obj ry))
|
||||
(format #t "~Tmax-dry: ~f~%" (-> obj max-dry))
|
||||
obj
|
||||
)
|
||||
|
||||
;; definition of type twister
|
||||
(deftype twister (basic)
|
||||
((num-joints int32 :offset-assert 4)
|
||||
(first-joint int32 :offset-assert 8)
|
||||
(last-joint int32 :offset-assert 12)
|
||||
(something uint16 :offset 12)
|
||||
(max-speed float :offset-assert 16)
|
||||
(smoothing float :offset-assert 20)
|
||||
(min-dist float :offset-assert 24)
|
||||
(target float :offset-assert 28)
|
||||
(ry float :offset-assert 32)
|
||||
(max-speed-ry float :offset-assert 36)
|
||||
(data twist-joint :inline :dynamic :offset-assert 40)
|
||||
)
|
||||
:method-count-assert 13
|
||||
:size-assert #x28
|
||||
:flag-assert #xd00000028
|
||||
(:methods
|
||||
(new (symbol _type_ int int float float float float) _type_ 0)
|
||||
(TODO-RENAME-9 (_type_ int int float) none 9)
|
||||
(set-target! (_type_ float) none 10)
|
||||
(TODO-RENAME-11 (_type_) none 11)
|
||||
(TODO-RENAME-12 (_type_ process-drawable) none 12)
|
||||
)
|
||||
)
|
||||
|
||||
;; definition for method 3 of type twister
|
||||
(defmethod inspect twister ((obj twister))
|
||||
(format #t "[~8x] ~A~%" obj (-> obj type))
|
||||
(format #t "~Tnum-joints: ~D~%" (-> obj num-joints))
|
||||
(format #t "~Tfirst-joint: ~D~%" (-> obj first-joint))
|
||||
(format #t "~Tlast-joint: ~D~%" (-> obj last-joint))
|
||||
(format #t "~Tmax-speed: ~f~%" (-> obj max-speed))
|
||||
(format #t "~Tsmoothing: ~f~%" (-> obj smoothing))
|
||||
(format #t "~Tmin-dist: ~f~%" (-> obj min-dist))
|
||||
(format #t "~Ttarget: ~f~%" (-> obj target))
|
||||
(format #t "~Try: ~f~%" (-> obj ry))
|
||||
(format #t "~Tmax-speed-ry: ~f~%" (-> obj max-speed-ry))
|
||||
(format #t "~Tdata[0] @ #x~X~%" (-> obj data))
|
||||
obj
|
||||
)
|
||||
|
||||
;; definition for method 0 of type twister
|
||||
(defmethod
|
||||
new
|
||||
twister
|
||||
((allocation symbol)
|
||||
(type-to-make twister)
|
||||
(arg0 int)
|
||||
(arg1 int)
|
||||
(arg2 float)
|
||||
(arg3 float)
|
||||
(arg4 float)
|
||||
(arg5 float)
|
||||
)
|
||||
(let* ((gp-0 (+ (- 1 arg0) arg1))
|
||||
(v0-0
|
||||
(object-new
|
||||
allocation
|
||||
(the-as type type-to-make)
|
||||
(the-as int (+ (-> type-to-make something) (* gp-0 16)))
|
||||
)
|
||||
)
|
||||
)
|
||||
(set! (-> v0-0 first-joint) arg0)
|
||||
(set! (-> v0-0 last-joint) arg1)
|
||||
(set! (-> v0-0 num-joints) gp-0)
|
||||
(set! (-> v0-0 max-speed) arg2)
|
||||
(set! (-> v0-0 smoothing) arg4)
|
||||
(set! (-> v0-0 min-dist) arg5)
|
||||
(set! (-> v0-0 target) 0.0)
|
||||
(set! (-> v0-0 ry) 0.0)
|
||||
(set! (-> v0-0 max-speed-ry) arg3)
|
||||
(dotimes (v1-4 gp-0)
|
||||
(set! (-> v0-0 data v1-4 ry) 0.0)
|
||||
(set! (-> v0-0 data v1-4 max-dry) 0.0)
|
||||
)
|
||||
v0-0
|
||||
)
|
||||
)
|
||||
|
||||
;; definition for method 5 of type twister
|
||||
(defmethod asize-of twister ((obj twister))
|
||||
(+ (* (-> obj num-joints) 16) 40)
|
||||
)
|
||||
|
||||
;; definition for method 9 of type twister
|
||||
;; INFO: Return type mismatch int vs none.
|
||||
(defmethod
|
||||
TODO-RENAME-9
|
||||
twister
|
||||
((obj twister) (arg0 int) (arg1 int) (arg2 float))
|
||||
(let ((v1-1 (- arg0 (-> obj first-joint)))
|
||||
(a1-2 (- arg1 (-> obj first-joint)))
|
||||
)
|
||||
(while (>= a1-2 v1-1)
|
||||
(set! (-> obj data v1-1 max-dry) arg2)
|
||||
(+! v1-1 1)
|
||||
)
|
||||
)
|
||||
0
|
||||
(none)
|
||||
)
|
||||
|
||||
;; definition for method 10 of type twister
|
||||
;; INFO: Return type mismatch int vs none.
|
||||
(defmethod set-target! twister ((obj twister) (arg0 float))
|
||||
(set! (-> obj target) arg0)
|
||||
0
|
||||
(none)
|
||||
)
|
||||
|
||||
;; definition for method 11 of type twister
|
||||
;; INFO: Return type mismatch int vs none.
|
||||
(defmethod TODO-RENAME-11 twister ((obj twister))
|
||||
(let* ((s5-0 (+ (-> obj num-joints) -1))
|
||||
(s4-0 (-> obj data s5-0))
|
||||
)
|
||||
(let ((f0-2 (deg-diff (-> s4-0 ry) (-> obj target))))
|
||||
(+!
|
||||
(-> s4-0 ry)
|
||||
(seek-with-smooth
|
||||
0.0
|
||||
f0-2
|
||||
(-> obj max-speed)
|
||||
(-> obj smoothing)
|
||||
(-> obj min-dist)
|
||||
)
|
||||
)
|
||||
)
|
||||
(let ((f30-1 (-> s4-0 ry)))
|
||||
(while (> s5-0 0)
|
||||
(+! s5-0 -1)
|
||||
(let ((s4-1 (-> obj data s5-0)))
|
||||
(let ((f0-9 (deg-diff f30-1 (-> s4-1 ry))))
|
||||
(cond
|
||||
((= (-> s4-1 max-dry) 0.0)
|
||||
(set! f0-9 0.0)
|
||||
)
|
||||
((< (fabs f0-9) (-> s4-1 max-dry))
|
||||
)
|
||||
((< f0-9 0.0)
|
||||
(set!
|
||||
f0-9
|
||||
(seek-with-smooth
|
||||
f0-9
|
||||
(- (-> s4-1 max-dry))
|
||||
(-> obj max-speed)
|
||||
(-> obj smoothing)
|
||||
(-> obj min-dist)
|
||||
)
|
||||
)
|
||||
)
|
||||
(else
|
||||
(set!
|
||||
f0-9
|
||||
(seek-with-smooth
|
||||
f0-9
|
||||
(-> s4-1 max-dry)
|
||||
(-> obj max-speed)
|
||||
(-> obj smoothing)
|
||||
(-> obj min-dist)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
(+! f30-1 f0-9)
|
||||
)
|
||||
(set! (-> s4-1 ry) f30-1)
|
||||
)
|
||||
)
|
||||
)
|
||||
)
|
||||
0
|
||||
(none)
|
||||
)
|
||||
|
||||
;; definition for method 12 of type twister
|
||||
;; INFO: Return type mismatch int vs none.
|
||||
(defmethod TODO-RENAME-12 twister ((obj twister) (arg0 process-drawable))
|
||||
(let ((s4-0 (new 'stack-no-clear 'matrix)))
|
||||
(dotimes (s3-0 (-> obj num-joints))
|
||||
(let
|
||||
((s2-0
|
||||
(-> arg0 node-list data (+ (-> obj first-joint) s3-0) bone transform)
|
||||
)
|
||||
)
|
||||
(matrix-rotate-y! s4-0 (-> obj data s3-0 ry))
|
||||
(vector-! (-> s2-0 vector 3) (-> s2-0 vector 3) (-> arg0 root trans))
|
||||
(matrix*! s2-0 s2-0 s4-0)
|
||||
(vector+! (-> s2-0 vector 3) (-> s2-0 vector 3) (-> arg0 root trans))
|
||||
)
|
||||
)
|
||||
)
|
||||
0
|
||||
(none)
|
||||
)
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user