mirror of
https://github.com/encounter/tp.git
synced 2026-07-11 06:18:46 -07:00
work on functionvalue (#2054)
This commit is contained in:
hatal175
@@ -1,29 +0,0 @@
|
||||
lbl_8028202C:
|
||||
/* 8028202C 94 21 FF F0 */ stwu r1, -0x10(r1)
|
||||
/* 80282030 7C 08 02 A6 */ mflr r0
|
||||
/* 80282034 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80282038 C8 04 00 00 */ lfd f0, 0(r4)
|
||||
/* 8028203C FC 21 00 28 */ fsub f1, f1, f0
|
||||
/* 80282040 80 03 00 08 */ lwz r0, 8(r3)
|
||||
/* 80282044 80 63 00 04 */ lwz r3, 4(r3)
|
||||
/* 80282048 90 61 00 08 */ stw r3, 8(r1)
|
||||
/* 8028204C 90 01 00 0C */ stw r0, 0xc(r1)
|
||||
/* 80282050 48 00 00 24 */ b lbl_80282074
|
||||
lbl_80282054:
|
||||
/* 80282054 80 61 00 08 */ lwz r3, 8(r1)
|
||||
/* 80282058 38 03 00 04 */ addi r0, r3, 4
|
||||
/* 8028205C 90 01 00 08 */ stw r0, 8(r1)
|
||||
/* 80282060 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80282064 81 83 00 00 */ lwz r12, 0(r3)
|
||||
/* 80282068 81 8C 00 1C */ lwz r12, 0x1c(r12)
|
||||
/* 8028206C 7D 89 03 A6 */ mtctr r12
|
||||
/* 80282070 4E 80 04 21 */ bctrl
|
||||
lbl_80282074:
|
||||
/* 80282074 80 61 00 08 */ lwz r3, 8(r1)
|
||||
/* 80282078 80 01 00 0C */ lwz r0, 0xc(r1)
|
||||
/* 8028207C 7C 03 00 40 */ cmplw r3, r0
|
||||
/* 80282080 40 82 FF D4 */ bne lbl_80282054
|
||||
/* 80282084 80 01 00 14 */ lwz r0, 0x14(r1)
|
||||
/* 80282088 7C 08 03 A6 */ mtlr r0
|
||||
/* 8028208C 38 21 00 10 */ addi r1, r1, 0x10
|
||||
/* 80282090 4E 80 00 20 */ blr
|
||||
@@ -1,36 +0,0 @@
|
||||
lbl_80282094:
|
||||
/* 80282094 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 80282098 7C 08 02 A6 */ mflr r0
|
||||
/* 8028209C 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 802820A0 DB E1 00 18 */ stfd f31, 0x18(r1)
|
||||
/* 802820A4 DB C1 00 10 */ stfd f30, 0x10(r1)
|
||||
/* 802820A8 FF C0 08 90 */ fmr f30, f1
|
||||
/* 802820AC CB E4 00 00 */ lfd f31, 0(r4)
|
||||
/* 802820B0 80 03 00 08 */ lwz r0, 8(r3)
|
||||
/* 802820B4 80 63 00 04 */ lwz r3, 4(r3)
|
||||
/* 802820B8 90 61 00 08 */ stw r3, 8(r1)
|
||||
/* 802820BC 90 01 00 0C */ stw r0, 0xc(r1)
|
||||
/* 802820C0 48 00 00 2C */ b lbl_802820EC
|
||||
lbl_802820C4:
|
||||
/* 802820C4 80 61 00 08 */ lwz r3, 8(r1)
|
||||
/* 802820C8 38 03 00 04 */ addi r0, r3, 4
|
||||
/* 802820CC 90 01 00 08 */ stw r0, 8(r1)
|
||||
/* 802820D0 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 802820D4 FC 20 F0 90 */ fmr f1, f30
|
||||
/* 802820D8 81 83 00 00 */ lwz r12, 0(r3)
|
||||
/* 802820DC 81 8C 00 1C */ lwz r12, 0x1c(r12)
|
||||
/* 802820E0 7D 89 03 A6 */ mtctr r12
|
||||
/* 802820E4 4E 80 04 21 */ bctrl
|
||||
/* 802820E8 FF FF 08 2A */ fadd f31, f31, f1
|
||||
lbl_802820EC:
|
||||
/* 802820EC 80 61 00 08 */ lwz r3, 8(r1)
|
||||
/* 802820F0 80 01 00 0C */ lwz r0, 0xc(r1)
|
||||
/* 802820F4 7C 03 00 40 */ cmplw r3, r0
|
||||
/* 802820F8 40 82 FF CC */ bne lbl_802820C4
|
||||
/* 802820FC FC 20 F8 90 */ fmr f1, f31
|
||||
/* 80282100 CB E1 00 18 */ lfd f31, 0x18(r1)
|
||||
/* 80282104 CB C1 00 10 */ lfd f30, 0x10(r1)
|
||||
/* 80282108 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 8028210C 7C 08 03 A6 */ mtlr r0
|
||||
/* 80282110 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 80282114 4E 80 00 20 */ blr
|
||||
@@ -1,36 +0,0 @@
|
||||
lbl_80282200:
|
||||
/* 80282200 94 21 FF E0 */ stwu r1, -0x20(r1)
|
||||
/* 80282204 7C 08 02 A6 */ mflr r0
|
||||
/* 80282208 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 8028220C DB E1 00 18 */ stfd f31, 0x18(r1)
|
||||
/* 80282210 DB C1 00 10 */ stfd f30, 0x10(r1)
|
||||
/* 80282214 FF C0 08 90 */ fmr f30, f1
|
||||
/* 80282218 CB E4 00 00 */ lfd f31, 0(r4)
|
||||
/* 8028221C 80 03 00 08 */ lwz r0, 8(r3)
|
||||
/* 80282220 80 63 00 04 */ lwz r3, 4(r3)
|
||||
/* 80282224 90 61 00 08 */ stw r3, 8(r1)
|
||||
/* 80282228 90 01 00 0C */ stw r0, 0xc(r1)
|
||||
/* 8028222C 48 00 00 2C */ b lbl_80282258
|
||||
lbl_80282230:
|
||||
/* 80282230 80 61 00 08 */ lwz r3, 8(r1)
|
||||
/* 80282234 38 03 00 04 */ addi r0, r3, 4
|
||||
/* 80282238 90 01 00 08 */ stw r0, 8(r1)
|
||||
/* 8028223C 80 63 00 00 */ lwz r3, 0(r3)
|
||||
/* 80282240 FC 20 F0 90 */ fmr f1, f30
|
||||
/* 80282244 81 83 00 00 */ lwz r12, 0(r3)
|
||||
/* 80282248 81 8C 00 1C */ lwz r12, 0x1c(r12)
|
||||
/* 8028224C 7D 89 03 A6 */ mtctr r12
|
||||
/* 80282250 4E 80 04 21 */ bctrl
|
||||
/* 80282254 FF FF 00 72 */ fmul f31, f31, f1
|
||||
lbl_80282258:
|
||||
/* 80282258 80 61 00 08 */ lwz r3, 8(r1)
|
||||
/* 8028225C 80 01 00 0C */ lwz r0, 0xc(r1)
|
||||
/* 80282260 7C 03 00 40 */ cmplw r3, r0
|
||||
/* 80282264 40 82 FF CC */ bne lbl_80282230
|
||||
/* 80282268 FC 20 F8 90 */ fmr f1, f31
|
||||
/* 8028226C CB E1 00 18 */ lfd f31, 0x18(r1)
|
||||
/* 80282270 CB C1 00 10 */ lfd f30, 0x10(r1)
|
||||
/* 80282274 80 01 00 24 */ lwz r0, 0x24(r1)
|
||||
/* 80282278 7C 08 03 A6 */ mtlr r0
|
||||
/* 8028227C 38 21 00 20 */ addi r1, r1, 0x20
|
||||
/* 80282280 4E 80 00 20 */ blr
|
||||
-77
@@ -1,77 +0,0 @@
|
||||
lbl_8028344C:
|
||||
/* 8028344C 94 21 FF C0 */ stwu r1, -0x40(r1)
|
||||
/* 80283450 7C 08 02 A6 */ mflr r0
|
||||
/* 80283454 90 01 00 44 */ stw r0, 0x44(r1)
|
||||
/* 80283458 93 E1 00 3C */ stw r31, 0x3c(r1)
|
||||
/* 8028345C 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80283460 D8 21 00 08 */ stfd f1, 8(r1)
|
||||
/* 80283464 80 A3 00 40 */ lwz r5, 0x40(r3)
|
||||
/* 80283468 38 7F 00 08 */ addi r3, r31, 8
|
||||
/* 8028346C C0 45 00 00 */ lfs f2, 0(r5)
|
||||
/* 80283470 80 9F 00 44 */ lwz r4, 0x44(r31)
|
||||
/* 80283474 38 84 FF FF */ addi r4, r4, -1
|
||||
/* 80283478 80 1F 00 48 */ lwz r0, 0x48(r31)
|
||||
/* 8028347C 7C 04 01 D6 */ mullw r0, r4, r0
|
||||
/* 80283480 54 00 10 3A */ slwi r0, r0, 2
|
||||
/* 80283484 7C 65 04 2E */ lfsx f3, r5, r0
|
||||
/* 80283488 4B FF E5 81 */ bl range_getParameter__Q27JStudio29TFunctionValueAttribute_rangeCFddd
|
||||
/* 8028348C D8 21 00 08 */ stfd f1, 8(r1)
|
||||
/* 80283490 80 7F 00 5C */ lwz r3, 0x5c(r31)
|
||||
/* 80283494 80 1F 00 60 */ lwz r0, 0x60(r31)
|
||||
/* 80283498 90 61 00 10 */ stw r3, 0x10(r1)
|
||||
/* 8028349C 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 802834A0 80 7F 00 54 */ lwz r3, 0x54(r31)
|
||||
/* 802834A4 80 1F 00 58 */ lwz r0, 0x58(r31)
|
||||
/* 802834A8 90 61 00 18 */ stw r3, 0x18(r1)
|
||||
/* 802834AC 90 01 00 1C */ stw r0, 0x1c(r1)
|
||||
/* 802834B0 80 7F 00 4C */ lwz r3, 0x4c(r31)
|
||||
/* 802834B4 80 1F 00 50 */ lwz r0, 0x50(r31)
|
||||
/* 802834B8 90 61 00 20 */ stw r3, 0x20(r1)
|
||||
/* 802834BC 90 01 00 24 */ stw r0, 0x24(r1)
|
||||
/* 802834C0 38 61 00 28 */ addi r3, r1, 0x28
|
||||
/* 802834C4 38 81 00 20 */ addi r4, r1, 0x20
|
||||
/* 802834C8 38 A1 00 18 */ addi r5, r1, 0x18
|
||||
/* 802834CC 38 C1 00 10 */ addi r6, r1, 0x10
|
||||
/* 802834D0 38 E1 00 08 */ addi r7, r1, 8
|
||||
/* 802834D4 48 00 03 85 */ bl func_80283858
|
||||
/* 802834D8 80 01 00 28 */ lwz r0, 0x28(r1)
|
||||
/* 802834DC 90 1F 00 5C */ stw r0, 0x5c(r31)
|
||||
/* 802834E0 80 01 00 2C */ lwz r0, 0x2c(r1)
|
||||
/* 802834E4 90 1F 00 60 */ stw r0, 0x60(r31)
|
||||
/* 802834E8 80 9F 00 5C */ lwz r4, 0x5c(r31)
|
||||
/* 802834EC 80 1F 00 4C */ lwz r0, 0x4c(r31)
|
||||
/* 802834F0 7C 04 00 40 */ cmplw r4, r0
|
||||
/* 802834F4 40 82 00 0C */ bne lbl_80283500
|
||||
/* 802834F8 C0 24 00 04 */ lfs f1, 4(r4)
|
||||
/* 802834FC 48 00 00 60 */ b lbl_8028355C
|
||||
lbl_80283500:
|
||||
/* 80283500 80 1F 00 54 */ lwz r0, 0x54(r31)
|
||||
/* 80283504 7C 04 00 40 */ cmplw r4, r0
|
||||
/* 80283508 40 82 00 24 */ bne lbl_8028352C
|
||||
/* 8028350C 80 1F 00 60 */ lwz r0, 0x60(r31)
|
||||
/* 80283510 54 03 10 3A */ slwi r3, r0, 2
|
||||
/* 80283514 80 1F 00 5C */ lwz r0, 0x5c(r31)
|
||||
/* 80283518 7C 03 00 50 */ subf r0, r3, r0
|
||||
/* 8028351C 90 1F 00 5C */ stw r0, 0x5c(r31)
|
||||
/* 80283520 80 7F 00 5C */ lwz r3, 0x5c(r31)
|
||||
/* 80283524 C0 23 00 04 */ lfs f1, 4(r3)
|
||||
/* 80283528 48 00 00 34 */ b lbl_8028355C
|
||||
lbl_8028352C:
|
||||
/* 8028352C 80 1F 00 48 */ lwz r0, 0x48(r31)
|
||||
/* 80283530 54 00 10 3A */ slwi r0, r0, 2
|
||||
/* 80283534 7C 60 20 50 */ subf r3, r0, r4
|
||||
/* 80283538 C8 21 00 08 */ lfd f1, 8(r1)
|
||||
/* 8028353C C0 43 00 00 */ lfs f2, 0(r3)
|
||||
/* 80283540 C0 63 00 04 */ lfs f3, 4(r3)
|
||||
/* 80283544 7C 63 02 14 */ add r3, r3, r0
|
||||
/* 80283548 C0 83 FF FC */ lfs f4, -4(r3)
|
||||
/* 8028354C C0 A4 00 00 */ lfs f5, 0(r4)
|
||||
/* 80283550 C0 C4 00 04 */ lfs f6, 4(r4)
|
||||
/* 80283554 C0 E4 00 08 */ lfs f7, 8(r4)
|
||||
/* 80283558 4B FF E1 B9 */ bl interpolateValue_hermite__Q27JStudio13functionvalueFddddddd
|
||||
lbl_8028355C:
|
||||
/* 8028355C 83 E1 00 3C */ lwz r31, 0x3c(r1)
|
||||
/* 80283560 80 01 00 44 */ lwz r0, 0x44(r1)
|
||||
/* 80283564 7C 08 03 A6 */ mtlr r0
|
||||
/* 80283568 38 21 00 40 */ addi r1, r1, 0x40
|
||||
/* 8028356C 4E 80 00 20 */ blr
|
||||
-58
@@ -1,58 +0,0 @@
|
||||
lbl_80282F10:
|
||||
/* 80282F10 94 21 FF D0 */ stwu r1, -0x30(r1)
|
||||
/* 80282F14 7C 08 02 A6 */ mflr r0
|
||||
/* 80282F18 90 01 00 34 */ stw r0, 0x34(r1)
|
||||
/* 80282F1C 93 E1 00 2C */ stw r31, 0x2c(r1)
|
||||
/* 80282F20 7C 7F 1B 78 */ mr r31, r3
|
||||
/* 80282F24 D8 21 00 08 */ stfd f1, 8(r1)
|
||||
/* 80282F28 80 A3 00 44 */ lwz r5, 0x44(r3)
|
||||
/* 80282F2C 38 7F 00 08 */ addi r3, r31, 8
|
||||
/* 80282F30 C0 45 00 00 */ lfs f2, 0(r5)
|
||||
/* 80282F34 80 9F 00 48 */ lwz r4, 0x48(r31)
|
||||
/* 80282F38 38 04 FF FF */ addi r0, r4, -1
|
||||
/* 80282F3C 54 00 18 38 */ slwi r0, r0, 3
|
||||
/* 80282F40 7C 65 04 2E */ lfsx f3, r5, r0
|
||||
/* 80282F44 4B FF EA C5 */ bl range_getParameter__Q27JStudio29TFunctionValueAttribute_rangeCFddd
|
||||
/* 80282F48 D8 21 00 08 */ stfd f1, 8(r1)
|
||||
/* 80282F4C 80 1F 00 54 */ lwz r0, 0x54(r31)
|
||||
/* 80282F50 90 01 00 10 */ stw r0, 0x10(r1)
|
||||
/* 80282F54 80 1F 00 50 */ lwz r0, 0x50(r31)
|
||||
/* 80282F58 90 01 00 14 */ stw r0, 0x14(r1)
|
||||
/* 80282F5C 80 1F 00 4C */ lwz r0, 0x4c(r31)
|
||||
/* 80282F60 90 01 00 18 */ stw r0, 0x18(r1)
|
||||
/* 80282F64 38 61 00 1C */ addi r3, r1, 0x1c
|
||||
/* 80282F68 38 81 00 18 */ addi r4, r1, 0x18
|
||||
/* 80282F6C 38 A1 00 14 */ addi r5, r1, 0x14
|
||||
/* 80282F70 38 C1 00 10 */ addi r6, r1, 0x10
|
||||
/* 80282F74 38 E1 00 08 */ addi r7, r1, 8
|
||||
/* 80282F78 48 00 06 65 */ bl func_802835DC
|
||||
/* 80282F7C 80 01 00 1C */ lwz r0, 0x1c(r1)
|
||||
/* 80282F80 90 1F 00 54 */ stw r0, 0x54(r31)
|
||||
/* 80282F84 80 7F 00 54 */ lwz r3, 0x54(r31)
|
||||
/* 80282F88 80 1F 00 4C */ lwz r0, 0x4c(r31)
|
||||
/* 80282F8C 7C 03 00 40 */ cmplw r3, r0
|
||||
/* 80282F90 40 82 00 0C */ bne lbl_80282F9C
|
||||
/* 80282F94 C0 23 00 04 */ lfs f1, 4(r3)
|
||||
/* 80282F98 48 00 00 3C */ b lbl_80282FD4
|
||||
lbl_80282F9C:
|
||||
/* 80282F9C 80 1F 00 50 */ lwz r0, 0x50(r31)
|
||||
/* 80282FA0 7C 03 00 40 */ cmplw r3, r0
|
||||
/* 80282FA4 40 82 00 1C */ bne lbl_80282FC0
|
||||
/* 80282FA8 80 7F 00 54 */ lwz r3, 0x54(r31)
|
||||
/* 80282FAC 38 03 FF F8 */ addi r0, r3, -8
|
||||
/* 80282FB0 90 1F 00 54 */ stw r0, 0x54(r31)
|
||||
/* 80282FB4 80 7F 00 54 */ lwz r3, 0x54(r31)
|
||||
/* 80282FB8 C0 23 00 04 */ lfs f1, 4(r3)
|
||||
/* 80282FBC 48 00 00 18 */ b lbl_80282FD4
|
||||
lbl_80282FC0:
|
||||
/* 80282FC0 7F E3 FB 78 */ mr r3, r31
|
||||
/* 80282FC4 C8 21 00 08 */ lfd f1, 8(r1)
|
||||
/* 80282FC8 81 9F 00 58 */ lwz r12, 0x58(r31)
|
||||
/* 80282FCC 7D 89 03 A6 */ mtctr r12
|
||||
/* 80282FD0 4E 80 04 21 */ bctrl
|
||||
lbl_80282FD4:
|
||||
/* 80282FD4 83 E1 00 2C */ lwz r31, 0x2c(r1)
|
||||
/* 80282FD8 80 01 00 34 */ lwz r0, 0x34(r1)
|
||||
/* 80282FDC 7C 08 03 A6 */ mtlr r0
|
||||
/* 80282FE0 38 21 00 30 */ addi r1, r1, 0x30
|
||||
/* 80282FE4 4E 80 00 20 */ blr
|
||||
@@ -34,6 +34,16 @@ struct TVector {
|
||||
extend = vector::extend_default;
|
||||
}
|
||||
|
||||
inline u32 size() const {
|
||||
if (pBegin_ == NULL) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return ((int)pEnd_ - (int)pBegin_) / 4;
|
||||
}
|
||||
|
||||
void **const begin() const { return pBegin_; }
|
||||
void **const end() const { return pEnd_; }
|
||||
void** begin() { return pBegin_; }
|
||||
void** end() { return pEnd_; }
|
||||
// void erase(void** arg1, void** arg2) {}
|
||||
@@ -57,9 +67,15 @@ struct TVector_pointer_void : TVector<void*, TAllocator> {
|
||||
|
||||
template <typename T>
|
||||
struct TVector_pointer : TVector_pointer_void {
|
||||
// TVector_pointer(const TAllocator<void*>& allocator) : TVector_pointer_void(allocator) {}
|
||||
TVector_pointer(const TAllocator<void*>& allocator) : TVector_pointer_void(allocator) {}
|
||||
~TVector_pointer() {}
|
||||
|
||||
const T* begin() const { return (const T*)TVector_pointer_void::begin(); }
|
||||
T* begin() { return (T*)TVector_pointer_void::begin(); }
|
||||
|
||||
const T* end() const { return (const T*)TVector_pointer_void::end(); }
|
||||
T* end() { return (T*)TVector_pointer_void::end(); }
|
||||
|
||||
void push_back(const T& ref) {
|
||||
static_cast<TVector_pointer_void*>(this)->push_back((const void*&)ref);
|
||||
}
|
||||
|
||||
@@ -5,8 +5,6 @@
|
||||
#include "JSystem/JGadget/vector.h"
|
||||
#include "global.h"
|
||||
|
||||
extern u8 lit_652[];
|
||||
|
||||
namespace JStudio {
|
||||
|
||||
typedef f64 (*ExtrapolateParameter)(f64, f64);
|
||||
@@ -21,7 +19,7 @@ class TFunctionValueAttribute_interpolate;
|
||||
class TFunctionValue {
|
||||
public:
|
||||
enum TEProgress { PROG_INIT };
|
||||
enum TEAdjust { ADJ_INIT };
|
||||
enum TEAdjust { ADJ_INIT, ADJ_UNK1, ADJ_UNK2, ADJ_UNK3, ADJ_UNK4 };
|
||||
enum TEOutside { OUT_INIT };
|
||||
enum TEInterpolate {};
|
||||
|
||||
@@ -78,8 +76,8 @@ public:
|
||||
|
||||
class TFunctionValueAttribute_refer : public JGadget::TVector_pointer<TFunctionValue*> {
|
||||
public:
|
||||
// TFunctionValueAttribute_refer() :
|
||||
// JGadget::TVector_pointer<TFunctionValue*>(JGadget::TAllocator<void*>()) {}
|
||||
TFunctionValueAttribute_refer() :
|
||||
JGadget::TVector_pointer<TFunctionValue*>(JGadget::TAllocator<void*>()) {}
|
||||
~TFunctionValueAttribute_refer() {}
|
||||
|
||||
/* 802816E8 */ void refer_initialize();
|
||||
@@ -112,16 +110,20 @@ public:
|
||||
void range_setOutside_begin(TFunctionValue::TEOutside begin) { mBegin = begin; }
|
||||
void range_setOutside_end(TFunctionValue::TEOutside end) { mEnd = end; }
|
||||
f64 range_getParameter_outside(f64 arg1) const {
|
||||
f64 temp = arg1 - fBegin_;
|
||||
f64 result = temp;
|
||||
if (temp < *(f64*)&lit_652) {
|
||||
result = TFunctionValue::toFunction(mBegin)(temp, fDifference_);
|
||||
} else if (temp >= fDifference_) {
|
||||
result = TFunctionValue::toFunction(mEnd)(temp, fDifference_);
|
||||
f64 result = arg1;
|
||||
result -= fBegin_;
|
||||
if (result < 0.0) {
|
||||
result = TFunctionValue::toFunction(mBegin)(result, fDifference_);
|
||||
} else if (result >= fDifference_) {
|
||||
result = TFunctionValue::toFunction(mEnd)(result, fDifference_);
|
||||
}
|
||||
return result + fBegin_;
|
||||
result += fBegin_;
|
||||
return result;
|
||||
}
|
||||
f64 range_getParameter_progress(f64 arg1) const { return _20 + _28 * (arg1 - _20); }
|
||||
f64 range_getBegin() const { return fBegin_;}
|
||||
f64 range_getEnd() const { return fEnd_;}
|
||||
f64 range_getDifference() const { return fDifference_; }
|
||||
|
||||
private:
|
||||
/* 0x00 */ f64 fBegin_;
|
||||
@@ -176,6 +178,8 @@ public:
|
||||
TData(f32 data) : f32data(data) {}
|
||||
|
||||
inline void operator=(const TData& rhs) { f32data = rhs.f32data; }
|
||||
u32 get_unsignedInteger() const { return u32data; }
|
||||
f64 get_value() const { return f32data; }
|
||||
|
||||
union {
|
||||
const void* rawData;
|
||||
@@ -196,17 +200,17 @@ public:
|
||||
/* 80281DE0 */ virtual void initialize();
|
||||
/* 80281E24 */ virtual void prepare();
|
||||
/* 80281E28 */ virtual f64 getValue(f64);
|
||||
/* 80281E5C */ void composite_raw(TVector_pointer<TFunctionValue*> const&, TData const&, f64);
|
||||
/* 80281EC8 */ void composite_index(TVector_pointer<TFunctionValue*> const&, TData const&, f64);
|
||||
/* 8028202C */ void composite_parameter(TVector_pointer<TFunctionValue*> const&, TData const&,
|
||||
f64);
|
||||
/* 80282094 */ void composite_add(TVector_pointer<JStudio::TFunctionValue*> const&,
|
||||
TData const&, f64);
|
||||
/* 80282118 */ void composite_subtract(TVector_pointer<TFunctionValue*> const&, TData const&,
|
||||
/* 80281E5C */ static f64 composite_raw(TVector_pointer<TFunctionValue*> const&, TData const&, f64);
|
||||
/* 80281EC8 */ static f64 composite_index(TVector_pointer<TFunctionValue*> const&, TData const&, f64);
|
||||
/* 8028202C */ static f64 composite_parameter(TVector_pointer<TFunctionValue*> const&,
|
||||
TData const&, f64);
|
||||
/* 80282094 */ static f64 composite_add(TVector_pointer<JStudio::TFunctionValue*> const&,
|
||||
TData const&, f64);
|
||||
/* 80282118 */ static f64 composite_subtract(TVector_pointer<TFunctionValue*> const&, TData const&,
|
||||
f64);
|
||||
/* 80282200 */ void composite_multiply(TVector_pointer<TFunctionValue*> const&, TData const&,
|
||||
/* 80282200 */ static f64 composite_multiply(TVector_pointer<TFunctionValue*> const&, TData const&,
|
||||
f64);
|
||||
/* 80282284 */ void composite_divide(TVector_pointer<TFunctionValue*> const&, TData const&,
|
||||
/* 80282284 */ static f64 composite_divide(TVector_pointer<TFunctionValue*> const&, TData const&,
|
||||
f64);
|
||||
|
||||
void data_set(CompositeFunc fn, const TData& dat) {
|
||||
@@ -239,6 +243,8 @@ public:
|
||||
_50 = a2;
|
||||
}
|
||||
|
||||
f64 data_getDifference() const { return _50 - _48; }
|
||||
|
||||
private:
|
||||
/* 0x48 */ f64 _48;
|
||||
/* 0x50 */ f64 _50;
|
||||
@@ -267,7 +273,7 @@ public:
|
||||
void data_set(const f32* pf, u32 u) {
|
||||
ASSERT((pf != NULL) || (u == 0));
|
||||
_44 = pf;
|
||||
_48 = u;
|
||||
uData_ = u;
|
||||
}
|
||||
|
||||
void data_setInterval(f64 f) {
|
||||
@@ -290,9 +296,9 @@ public:
|
||||
|
||||
private:
|
||||
/* 0x44 */ const f32* _44;
|
||||
/* 0x48 */ u32 _48;
|
||||
/* 0x48 */ u32 uData_;
|
||||
/* 0x50 */ f64 _50;
|
||||
/* 0x58 */ update_INTERPOLATE _58;
|
||||
/* 0x58 */ update_INTERPOLATE pfnUpdate_;
|
||||
};
|
||||
|
||||
class TFunctionValue_list_parameter : TFunctionValue,
|
||||
@@ -304,6 +310,11 @@ public:
|
||||
TIterator_data_(const TIterator_data_& other) : value_(other.value_) {}
|
||||
|
||||
void operator=(const TIterator_data_& rhs) { value_ = rhs.value_; }
|
||||
TIterator_data_& operator--() {
|
||||
value_ -= 2;
|
||||
return *this;
|
||||
}
|
||||
friend bool operator==(const TIterator_data_& lhs, const TIterator_data_& rhs) { return lhs.value_ == rhs.value_; }
|
||||
|
||||
const f32* get() const { return value_; }
|
||||
void set(const f32* value) { value_ = value; }
|
||||
@@ -331,13 +342,18 @@ public:
|
||||
/* 80283060 */ static f64
|
||||
update_INTERPOLATE_BSPLINE_dataMore3_(JStudio::TFunctionValue_list_parameter const&, f64);
|
||||
|
||||
f64 data_getValue_back() {
|
||||
return pfData_[(uData_ - 1) * 2];
|
||||
}
|
||||
f64 data_getValue_front() { return pfData_[0]; }
|
||||
|
||||
private:
|
||||
/* 0x44 */ const f32* _44;
|
||||
/* 0x48 */ u32 _48;
|
||||
/* 0x44 */ const f32* pfData_;
|
||||
/* 0x48 */ u32 uData_;
|
||||
/* 0x4c */ TIterator_data_ dat1;
|
||||
/* 0x50 */ TIterator_data_ dat2;
|
||||
/* 0x54 */ TIterator_data_ dat3;
|
||||
/* 0x58 */ update_INTERPOLATE _58;
|
||||
/* 0x58 */ update_INTERPOLATE pfnUpdate_;
|
||||
};
|
||||
|
||||
class TFunctionValue_hermite : TFunctionValue, TFunctionValueAttribute_range {
|
||||
@@ -347,19 +363,19 @@ public:
|
||||
value_ = value;
|
||||
size_ = rParent.data_getSize();
|
||||
}
|
||||
TIterator_data_(const TIterator_data_& other) {
|
||||
value_ = other.value_;
|
||||
size_ = other.size_;
|
||||
}
|
||||
|
||||
const f32* get() { return value_; }
|
||||
|
||||
void set(const f32* value, u32 size) {
|
||||
value_ = value;
|
||||
size_ = size;
|
||||
}
|
||||
|
||||
friend bool operator==(const TIterator_data_& lhs, const TIterator_data_& rhs) { return lhs.value_ == rhs.value_; }
|
||||
|
||||
void operator=(const TIterator_data_& rhs) {
|
||||
value_ = rhs.value_;
|
||||
size_ = rhs.size_;
|
||||
TIterator_data_& operator--() {
|
||||
value_ -= size_;
|
||||
return *this;
|
||||
}
|
||||
|
||||
/* 0x00 */ const f32* value_;
|
||||
@@ -377,6 +393,10 @@ public:
|
||||
/* 8028344C */ virtual f64 getValue(f64);
|
||||
|
||||
u32 data_getSize() const { return uSize_; }
|
||||
f64 data_getValue_back() {
|
||||
return pf_[(u_ - 1) * uSize_];
|
||||
}
|
||||
f64 data_getValue_front() { return pf_[0]; }
|
||||
|
||||
private:
|
||||
/* 0x40 */ const f32* pf_;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -9,6 +9,13 @@ inline void advance( InputIt& it, Distance n) {
|
||||
++it;
|
||||
}
|
||||
}
|
||||
|
||||
// This needs to be defined with gcc concepts or something similar. Workaround.
|
||||
template< class InputIt, class Distance >
|
||||
inline void advance_pointer( InputIt& it, Distance n) {
|
||||
it += n;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user