Skip to content

Commit 7d070d0

Browse files
committed
GJTransformControl and GJTransformState
1 parent 5d22ba8 commit 7d070d0

File tree

2 files changed

+31
-39
lines changed

2 files changed

+31
-39
lines changed

bindings/2.2074/Extras.bro

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -127,23 +127,18 @@ class DynamicObjectAction {
127127

128128
class GJTransformState {
129129
GJTransformState() {
130-
m_unk1 = 0.f;
131-
m_unk2 = false;
132-
m_unk5 = cocos2d::CCPoint {};
133-
m_unk6 = cocos2d::CCPoint {};
134-
m_unk7 = cocos2d::CCPoint {};
135-
m_angleY = 0.f;
136-
m_skewX = 0.f;
137-
m_skewY = 0.f;
138-
m_unk3 = 0.f;
139-
m_unk4 = 0.f;
140-
m_unk5.x = 0.f;
141-
m_unk5.y = 0.f;
142130
m_scaleX = 1.f;
143131
m_scaleY = 1.f;
144132
m_angleX = 0.f;
145-
m_unk8 = 1.f;
146-
m_unk9 = 1.f;
133+
m_angleY = 0.f;
134+
m_skewX = 0.f;
135+
m_skewY = 0.f;
136+
m_transformRotation = 0.f;
137+
m_transformReset = false;
138+
m_transformRotationX = 0.f;
139+
m_transformRotationY = 0.f;
140+
m_transformScaleX = 1.f;
141+
m_transformScaleY = 1.f;
147142
}
148143

149144
float m_scaleX;
@@ -152,15 +147,15 @@ class GJTransformState {
152147
float m_angleY;
153148
float m_skewX;
154149
float m_skewY;
155-
float m_unk1;
156-
bool m_unk2;
157-
float m_unk3;
158-
float m_unk4;
159-
cocos2d::CCPoint m_unk5;
160-
cocos2d::CCPoint m_unk6;
161-
cocos2d::CCPoint m_unk7;
162-
float m_unk8;
163-
float m_unk9;
150+
float m_transformRotation;
151+
bool m_transformReset;
152+
float m_transformRotationX;
153+
float m_transformRotationY;
154+
cocos2d::CCPoint m_transformPosition;
155+
cocos2d::CCPoint m_transformSkewX;
156+
cocos2d::CCPoint m_transformSkewY;
157+
float m_transformScaleX;
158+
float m_transformScaleY;
164159
}
165160

166161
class CAState {

bindings/2.2074/GeometryDash.bro

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12066,8 +12066,6 @@ class GJRotateCommandLayer : SetupTriggerPopup {
1206612066
class GJRotationControl : cocos2d::CCLayer {
1206712067
// virtual ~GJRotationControl();
1206812068
GJRotationControl() {
12069-
m_cursorDifference = cocos2d::CCPointMake(0.0f, 0.0f);
12070-
m_controlPosition = cocos2d::CCPointMake(0.0f, 0.0f);
1207112069
m_controlSprite = nullptr;
1207212070
m_startingRotation = 0.0f;
1207312071
m_currentRotation = 0.0f;
@@ -12782,10 +12780,10 @@ class GJTransformControl : cocos2d::CCLayer {
1278212780
TodoReturn applyRotation(float);
1278312781
TodoReturn calculateRotationOffset();
1278412782
void finishTouch();
12785-
void loadFromState(GJTransformState&);
12786-
TodoReturn loadValues(GameObject*, cocos2d::CCArray*, gd::unordered_map<int, GameObjectEditorState>&);
12783+
void loadFromState(GJTransformState&) = win 0x25cb40;
12784+
void loadValues(GameObject*, cocos2d::CCArray*, gd::unordered_map<int, GameObjectEditorState>&) = win 0x128190;
1278712785
TodoReturn logCurrentZeroPos();
12788-
void onToggleLockScale(cocos2d::CCObject* sender);
12786+
void onToggleLockScale(cocos2d::CCObject* sender) = win 0x129780;
1278912787
void refreshControl() = win 0x1295f0, m1 0x43948, imac 0x4ab90;
1279012788
void saveToState(GJTransformState&);
1279112789
void scaleButtons(float) = win 0x129810;
@@ -12796,29 +12794,28 @@ class GJTransformControl : cocos2d::CCLayer {
1279612794
void updateButtons(bool, bool) = win 0x1298d0, m1 0x43f04, imac 0x4b1b0;
1279712795
TodoReturn updateMinMaxPositions();
1279812796

12799-
// 2lazy
1280012797
cocos2d::CCNode* m_mainNodeParent;
1280112798
cocos2d::CCNode* m_mainNode;
12802-
cocos2d::CCArray* m_unk1;
12799+
cocos2d::CCArray* m_objects;
1280312800
int m_touchID;
1280412801
short m_transformButtonType;
1280512802
GJTransformControlDelegate* m_delegate;
1280612803
cocos2d::CCPoint m_cursorDifference;
12807-
cocos2d::CCPoint m_touchStart;
12808-
cocos2d::CCPoint m_unk3;
12809-
cocos2d::CCPoint m_unk4;
12810-
cocos2d::CCPoint m_unk5;
12811-
cocos2d::CCPoint m_unk6;
12812-
cocos2d::CCPoint m_unk7;
12804+
cocos2d::CCPoint m_topRight;
12805+
cocos2d::CCPoint m_bottomLeft;
12806+
cocos2d::CCPoint m_topRightPosition;
12807+
cocos2d::CCPoint m_bottomLeftPosition;
12808+
cocos2d::CCPoint m_topRightOrigin;
12809+
cocos2d::CCPoint m_bottomLeftOrigin;
1281312810
cocos2d::CCArray* m_warpSprites;
1281412811
cocos2d::CCPoint m_rotatePosition;
1281512812
CCMenuItemSpriteExtra* m_warpLockButton;
1281612813
float m_scaleX;
1281712814
float m_scaleY;
1281812815
bool m_warpLocked;
12819-
float m_unk10;
12820-
float m_unk11;
12821-
float m_unk12;
12816+
float m_rotationX;
12817+
float m_rotationY;
12818+
float m_rotation;
1282212819
float m_buttonScale;
1282312820
}
1282412821

0 commit comments

Comments
 (0)