Skip to content

Commit 1cd6441

Browse files
author
punkice3407
committed
Support for negative offsets
1 parent 9215a2f commit 1cd6441

9 files changed

Lines changed: 30 additions & 32 deletions

File tree

‎src/otlib/components/ThingTypeEditor.mxml‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ THE SOFTWARE.
9797
private var _previewMode:Boolean;
9898
private var _lastAnimationFrame:uint;
9999
private var _settings:ObjectBuilderSettings;
100-
100+
101101
[Bindable]
102102
private var _frameGroup:FrameGroup;
103103
@@ -361,10 +361,10 @@ THE SOFTWARE.
361361
isLensHelpGroupCheckBox.includeInLayout = isItem;
362362
363363
if (info.clientVersion >= 755) {
364-
offsetXNumericStepper.minimum = 1;
365-
offsetXNumericStepper.maximum = 32;
366-
offsetYNumericStepper.minimum = 1;
367-
offsetYNumericStepper.maximum = 32;
364+
offsetXNumericStepper.minimum = -64;
365+
offsetXNumericStepper.maximum = 64;
366+
offsetYNumericStepper.minimum = -64;
367+
offsetYNumericStepper.maximum = 64;
368368
} else {
369369
offsetXNumericStepper.minimum = 8;
370370
offsetXNumericStepper.maximum = 8;
@@ -1021,7 +1021,7 @@ THE SOFTWARE.
10211021
_frameGroup.frameDurations[frame] = currentDuration.clone();
10221022
}
10231023
}
1024-
}
1024+
}
10251025
10261026
]]>
10271027
</fx:Script>
@@ -1508,7 +1508,6 @@ THE SOFTWARE.
15081508
textAlign="right"/>
15091509
<s:NumericStepper id="offsetXNumericStepper"
15101510
width="80"
1511-
maximum="32"
15121511
value="{_thingBinding.offsetX}"
15131512
change="{_thingBinding.offsetX = offsetXNumericStepper.value;}"/>
15141513
<s:Spacer width="30"/>
@@ -1521,7 +1520,6 @@ THE SOFTWARE.
15211520
textAlign="right"/>
15221521
<s:NumericStepper id="offsetYNumericStepper"
15231522
width="80"
1524-
maximum="32"
15251523
value="{_thingBinding.offsetY}"
15261524
change="{_thingBinding.offsetY = offsetYNumericStepper.value;}"/>
15271525
<s:Spacer width="30"/>

‎src/otlib/obd/OBDEncoder.as‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -768,8 +768,8 @@ package otlib.obd
768768

769769
case HAS_OFFSET:
770770
thing.hasOffset = true;
771-
thing.offsetX = input.readUnsignedShort();
772-
thing.offsetY = input.readUnsignedShort();
771+
thing.offsetX = input.readShort();
772+
thing.offsetY = input.readShort();
773773
break;
774774

775775
case HAS_ELEVATION:

‎src/otlib/things/BindableThingType.as‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ package otlib.things
135135
public var hasOffset:Boolean;
136136

137137
[Bindable]
138-
public var offsetX:uint;
138+
public var offsetX:int;
139139

140140
[Bindable]
141-
public var offsetY:uint;
141+
public var offsetY:int;
142142

143143
[Bindable]
144144
public var dontHide:Boolean;
@@ -385,7 +385,7 @@ package otlib.things
385385
var frameGroup:FrameGroup = this.getFrameGroup(groupType);
386386
if(!frameGroup)
387387
continue;
388-
388+
389389
thing.frameGroups[groupType] = frameGroup.clone();
390390
}
391391

‎src/otlib/things/MetadataReader3.as‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ package otlib.things
156156

157157
case MetadataFlags3.HAS_OFFSET:
158158
type.hasOffset = true;
159-
type.offsetX = readUnsignedShort();
160-
type.offsetY = readUnsignedShort();
159+
type.offsetX = readShort();
160+
type.offsetY = readShort();
161161
break;
162162

163163
case MetadataFlags3.HAS_ELEVATION:

‎src/otlib/things/MetadataReader4.as‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ package otlib.things
166166

167167
case MetadataFlags4.HAS_OFFSET:
168168
type.hasOffset = true;
169-
type.offsetX = readUnsignedShort();
170-
type.offsetY = readUnsignedShort();
169+
type.offsetX = readShort();
170+
type.offsetY = readShort();
171171
break;
172172

173173
case MetadataFlags4.HAS_ELEVATION:

‎src/otlib/things/MetadataReader5.as‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ package otlib.things
163163

164164
case MetadataFlags5.HAS_OFFSET:
165165
type.hasOffset = true;
166-
type.offsetX = readUnsignedShort();
167-
type.offsetY = readUnsignedShort();
166+
type.offsetX = readShort();
167+
type.offsetY = readShort();
168168
break;
169169

170170
case MetadataFlags5.HAS_ELEVATION:

‎src/otlib/things/MetadataReader6.as‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,8 +166,8 @@ package otlib.things
166166

167167
case MetadataFlags6.HAS_OFFSET:
168168
type.hasOffset = true;
169-
type.offsetX = readUnsignedShort();
170-
type.offsetY = readUnsignedShort();
169+
type.offsetX = readShort();
170+
type.offsetY = readShort();
171171
break;
172172

173173
case MetadataFlags6.HAS_ELEVATION:

‎src/otlib/things/ThingSerializer.as‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -394,8 +394,8 @@ package otlib.things
394394
break;
395395
case MetadataFlags3.HAS_OFFSET:
396396
thing.hasOffset = true;
397-
thing.offsetX = input.readUnsignedShort();
398-
thing.offsetY = input.readUnsignedShort();
397+
thing.offsetX = input.readShort();
398+
thing.offsetY = input.readShort();
399399
break;
400400
case MetadataFlags3.HAS_ELEVATION:
401401
thing.hasElevation = true;
@@ -526,8 +526,8 @@ package otlib.things
526526
break;
527527
case MetadataFlags4.HAS_OFFSET:
528528
thing.hasOffset = true;
529-
thing.offsetX = input.readUnsignedShort();
530-
thing.offsetY = input.readUnsignedShort();
529+
thing.offsetX = input.readShort();
530+
thing.offsetY = input.readShort();
531531
break;
532532
case MetadataFlags4.HAS_ELEVATION:
533533
thing.hasElevation = true;
@@ -658,8 +658,8 @@ package otlib.things
658658
break;
659659
case MetadataFlags5.HAS_OFFSET:
660660
thing.hasOffset = true;
661-
thing.offsetX = input.readUnsignedShort();
662-
thing.offsetY = input.readUnsignedShort();
661+
thing.offsetX = input.readShort();
662+
thing.offsetY = input.readShort();
663663
break;
664664
case MetadataFlags5.HAS_ELEVATION:
665665
thing.hasElevation = true;
@@ -807,8 +807,8 @@ package otlib.things
807807
break;
808808
case MetadataFlags6.HAS_OFFSET:
809809
thing.hasOffset = true;
810-
thing.offsetX = input.readUnsignedShort();
811-
thing.offsetY = input.readUnsignedShort();
810+
thing.offsetX = input.readShort();
811+
thing.offsetY = input.readShort();
812812
break;
813813
case MetadataFlags6.HAS_ELEVATION:
814814
thing.hasElevation = true;
@@ -860,7 +860,7 @@ package otlib.things
860860
break;
861861
case MetadataFlags6.TOP_EFFECT:
862862
thing.topEffect = true;
863-
break;
863+
break;
864864
case MetadataFlags6.USABLE:
865865
thing.usable = true;
866866
break;

‎src/otlib/things/ThingType.as‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ package otlib.things
7676
public var isTranslucent:Boolean;
7777
public var floorChange:Boolean;
7878
public var hasOffset:Boolean;
79-
public var offsetX:uint;
80-
public var offsetY:uint;
79+
public var offsetX:int;
80+
public var offsetY:int;
8181
public var hasElevation:Boolean;
8282
public var elevation:uint;
8383
public var isLyingObject:Boolean;

0 commit comments

Comments
 (0)