Skip to content

Commit db747ab

Browse files
cagedcaged
committed
cleanup output for chipmunk and box2d
1 parent c5236ec commit db747ab

File tree

2 files changed

+53
-69
lines changed

2 files changed

+53
-69
lines changed

‎English.lproj/VertexDocument.xib

Lines changed: 46 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
33
<data>
4-
<int key="IBDocument.SystemTarget">1060</int>
5-
<string key="IBDocument.SystemVersion">10C540</string>
6-
<string key="IBDocument.InterfaceBuilderVersion">740</string>
7-
<string key="IBDocument.AppKitVersion">1038.25</string>
8-
<string key="IBDocument.HIToolboxVersion">458.00</string>
4+
<int key="IBDocument.SystemTarget">1050</int>
5+
<string key="IBDocument.SystemVersion">10D573</string>
6+
<string key="IBDocument.InterfaceBuilderVersion">762</string>
7+
<string key="IBDocument.AppKitVersion">1038.29</string>
8+
<string key="IBDocument.HIToolboxVersion">460.00</string>
99
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
1010
<bool key="EncodedWithXMLCoder">YES</bool>
1111
<object class="NSArray" key="dict.sortedKeys">
@@ -15,12 +15,13 @@
1515
</object>
1616
<object class="NSMutableArray" key="dict.values">
1717
<bool key="EncodedWithXMLCoder">YES</bool>
18-
<string>740</string>
18+
<string>762</string>
1919
<string>1.1</string>
2020
</object>
2121
</object>
2222
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
2323
<bool key="EncodedWithXMLCoder">YES</bool>
24+
<integer value="100023"/>
2425
</object>
2526
<object class="NSArray" key="IBDocument.PluginDependencies">
2627
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -55,7 +56,7 @@
5556
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
5657
<string key="NSWindowContentMinSize">{94, 86}</string>
5758
<object class="NSView" key="NSWindowView" id="568628114">
58-
<nil key="NSNextResponder"/>
59+
<reference key="NSNextResponder"/>
5960
<int key="NSvFlags">274</int>
6061
<object class="NSMutableArray" key="NSSubviews">
6162
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -72,7 +73,7 @@
7273
<object class="NSButton" id="643821912">
7374
<reference key="NSNextResponder" ref="808025513"/>
7475
<int key="NSvFlags">268</int>
75-
<string key="NSFrame">{{268, 301}, {99, 18}}</string>
76+
<string key="NSFrame">{{268, 302}, {99, 18}}</string>
7677
<reference key="NSSuperview" ref="808025513"/>
7778
<bool key="NSEnabled">YES</bool>
7879
<object class="NSButtonCell" key="NSCell" id="118179008">
@@ -103,7 +104,7 @@
103104
<object class="NSButton" id="335564871">
104105
<reference key="NSNextResponder" ref="808025513"/>
105106
<int key="NSvFlags">268</int>
106-
<string key="NSFrame">{{179, 297}, {83, 25}}</string>
107+
<string key="NSFrame">{{179, 298}, {83, 25}}</string>
107108
<reference key="NSSuperview" ref="808025513"/>
108109
<bool key="NSEnabled">YES</bool>
109110
<object class="NSButtonCell" key="NSCell" id="476847853">
@@ -123,7 +124,7 @@
123124
<object class="NSButton" id="348755752">
124125
<reference key="NSNextResponder" ref="808025513"/>
125126
<int key="NSvFlags">268</int>
126-
<string key="NSFrame">{{94, 297}, {77, 25}}</string>
127+
<string key="NSFrame">{{94, 298}, {77, 25}}</string>
127128
<reference key="NSSuperview" ref="808025513"/>
128129
<bool key="NSEnabled">YES</bool>
129130
<object class="NSButtonCell" key="NSCell" id="812621054">
@@ -143,7 +144,7 @@
143144
<object class="NSButton" id="279304298">
144145
<reference key="NSNextResponder" ref="808025513"/>
145146
<int key="NSvFlags">268</int>
146-
<string key="NSFrame">{{20, 297}, {66, 25}}</string>
147+
<string key="NSFrame">{{20, 298}, {66, 25}}</string>
147148
<reference key="NSSuperview" ref="808025513"/>
148149
<bool key="NSEnabled">YES</bool>
149150
<object class="NSButtonCell" key="NSCell" id="443600529">
@@ -170,10 +171,10 @@
170171
<string>NSFilenamesPboardType</string>
171172
</object>
172173
</object>
173-
<string key="NSFrameSize">{599, 289}</string>
174+
<string key="NSFrameSize">{599, 290}</string>
174175
<reference key="NSSuperview" ref="808025513"/>
175176
<bool key="NSViewIsLayerTreeHost">YES</bool>
176-
<float key="zoomFactor">0.0</float>
177+
<float key="zoomFactor">0.18125000596046448</float>
177178
<float key="rotationAngle">0.0</float>
178179
<string key="currentToolMode">IKToolModeNone</string>
179180
<bool key="autoresizes">YES</bool>
@@ -189,7 +190,7 @@
189190
</object>
190191
</object>
191192
</object>
192-
<string key="NSFrameSize">{599, 341}</string>
193+
<string key="NSFrameSize">{599, 342}</string>
193194
<reference key="NSSuperview" ref="958765573"/>
194195
<string key="NSClassName">NSView</string>
195196
</object>
@@ -201,13 +202,13 @@
201202
<object class="NSTextField" id="181462871">
202203
<reference key="NSNextResponder" ref="190226495"/>
203204
<int key="NSvFlags">268</int>
204-
<string key="NSFrame">{{17, 38}, {68, 17}}</string>
205+
<string key="NSFrame">{{-15, 38}, {100, 17}}</string>
205206
<reference key="NSSuperview" ref="190226495"/>
206207
<bool key="NSEnabled">YES</bool>
207208
<object class="NSTextFieldCell" key="NSCell" id="550451937">
208209
<int key="NSCellFlags">68288064</int>
209210
<int key="NSCellFlags2">71304192</int>
210-
<string key="NSContents">Variable:</string>
211+
<string key="NSContents">Name:</string>
211212
<reference key="NSSupport" ref="673925191"/>
212213
<reference key="NSControlView" ref="181462871"/>
213214
<object class="NSColor" key="NSBackgroundColor" id="130633971">
@@ -239,7 +240,7 @@
239240
<object class="NSTextFieldCell" key="NSCell" id="546963343">
240241
<int key="NSCellFlags">-1804468671</int>
241242
<int key="NSCellFlags2">272630784</int>
242-
<string key="NSContents"/>
243+
<string key="NSContents">vtx</string>
243244
<reference key="NSSupport" ref="673925191"/>
244245
<reference key="NSControlView" ref="525144916"/>
245246
<bool key="NSDrawsBackground">YES</bool>
@@ -654,10 +655,10 @@
654655
</object>
655656
<string key="NSFrameSize">{599, 530}</string>
656657
<reference key="NSSuperview" ref="568628114"/>
657-
<int key="NSDividerStyle">3</int>
658658
</object>
659659
</object>
660660
<string key="NSFrameSize">{599, 530}</string>
661+
<reference key="NSSuperview"/>
661662
</object>
662663
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
663664
<string key="NSMinSize">{94, 108}</string>
@@ -1302,9 +1303,9 @@
13021303
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
13031304
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
13041305
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1305-
<string>{{144, 382}, {599, 530}}</string>
1306+
<string>{{144, 326}, {599, 530}}</string>
13061307
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
1307-
<string>{{144, 382}, {599, 530}}</string>
1308+
<string>{{144, 326}, {599, 530}}</string>
13081309
<integer value="1"/>
13091310
<string>{{201, 387}, {507, 413}}</string>
13101311
<integer value="1"/>
@@ -1375,6 +1376,14 @@
13751376
<string>NSTextField</string>
13761377
</object>
13771378
</object>
1379+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
1380+
<string key="majorKey">IBProjectSource</string>
1381+
<string key="minorKey">VertexDocument.h</string>
1382+
</object>
1383+
</object>
1384+
<object class="IBPartialClassDescription">
1385+
<string key="className">VertexDocument</string>
1386+
<string key="superclassName">NSDocument</string>
13781387
<object class="IBClassDescriptionSource" key="sourceIdentifier">
13791388
<string key="majorKey">IBUserSource</string>
13801389
<string key="minorKey"/>
@@ -1386,33 +1395,6 @@
13861395
<object class="IBPartialClassDescription">
13871396
<string key="className">IKImageView</string>
13881397
<string key="superclassName">NSView</string>
1389-
<object class="NSMutableDictionary" key="actions">
1390-
<bool key="EncodedWithXMLCoder">YES</bool>
1391-
<object class="NSArray" key="dict.sortedKeys">
1392-
<bool key="EncodedWithXMLCoder">YES</bool>
1393-
<string>crop:</string>
1394-
<string>flipImageHorizontal:</string>
1395-
<string>flipImageVertical:</string>
1396-
<string>rotateImageLeft:</string>
1397-
<string>rotateImageRight:</string>
1398-
<string>zoomImageToActualSize:</string>
1399-
<string>zoomImageToFit:</string>
1400-
<string>zoomIn:</string>
1401-
<string>zoomOut:</string>
1402-
</object>
1403-
<object class="NSMutableArray" key="dict.values">
1404-
<bool key="EncodedWithXMLCoder">YES</bool>
1405-
<string>id</string>
1406-
<string>id</string>
1407-
<string>id</string>
1408-
<string>id</string>
1409-
<string>id</string>
1410-
<string>id</string>
1411-
<string>id</string>
1412-
<string>id</string>
1413-
<string>id</string>
1414-
</object>
1415-
</object>
14161398
<object class="IBClassDescriptionSource" key="sourceIdentifier">
14171399
<string key="majorKey">IBFrameworkSource</string>
14181400
<string key="minorKey">ImageKit.framework/Headers/IKImageView.h</string>
@@ -1820,13 +1802,6 @@
18201802
<string key="minorKey">ImageKit.framework/Headers/IKImageBrowserView.h</string>
18211803
</object>
18221804
</object>
1823-
<object class="IBPartialClassDescription">
1824-
<string key="className">NSObject</string>
1825-
<object class="IBClassDescriptionSource" key="sourceIdentifier">
1826-
<string key="majorKey">IBFrameworkSource</string>
1827-
<string key="minorKey">ImageKit.framework/Headers/IKSaveOptions.h</string>
1828-
</object>
1829-
</object>
18301805
<object class="IBPartialClassDescription">
18311806
<string key="className">NSObject</string>
18321807
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1890,13 +1865,6 @@
18901865
<string key="minorKey">QuartzFilters.framework/Headers/QuartzFilterManager.h</string>
18911866
</object>
18921867
</object>
1893-
<object class="IBPartialClassDescription">
1894-
<string key="className">NSObject</string>
1895-
<object class="IBClassDescriptionSource" key="sourceIdentifier">
1896-
<string key="majorKey">IBFrameworkSource</string>
1897-
<string key="minorKey">QuickLookUI.framework/Headers/QLPreviewPanel.h</string>
1898-
</object>
1899-
</object>
19001868
<object class="IBPartialClassDescription">
19011869
<string key="className">NSPopUpButton</string>
19021870
<string key="superclassName">NSButton</string>
@@ -2032,9 +2000,10 @@
20322000
</object>
20332001
</object>
20342002
<int key="IBDocument.localizationMode">0</int>
2003+
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
20352004
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
20362005
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
2037-
<integer value="1060" key="NS.object.0"/>
2006+
<integer value="1050" key="NS.object.0"/>
20382007
</object>
20392008
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
20402009
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
@@ -2043,5 +2012,20 @@
20432012
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
20442013
<string key="IBDocument.LastKnownRelativeProjectPath">../VertexHelper.xcodeproj</string>
20452014
<int key="IBDocument.defaultPropertyAccessControl">3</int>
2015+
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
2016+
<bool key="EncodedWithXMLCoder">YES</bool>
2017+
<object class="NSArray" key="dict.sortedKeys">
2018+
<bool key="EncodedWithXMLCoder">YES</bool>
2019+
<string>NSMenuCheckmark</string>
2020+
<string>NSMenuMixedState</string>
2021+
<string>NSSwitch</string>
2022+
</object>
2023+
<object class="NSMutableArray" key="dict.values">
2024+
<bool key="EncodedWithXMLCoder">YES</bool>
2025+
<string>{9, 8}</string>
2026+
<string>{7, 2}</string>
2027+
<string>{15, 15}</string>
2028+
</object>
2029+
</object>
20462030
</data>
20472031
</archive>

‎VertexDocument.m

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ - (void)updateResultTextField
142142
result = [result stringByAppendingFormat:@"//row %i, col %i\n", ([pointMatrix count] - r), (c + 1)];
143143

144144
if ([typePopUpButton selectedTag] != VHTYPE_PURE) {
145-
result = [result stringByAppendingFormat:@"num = %i;\n", [points count]];
145+
result = [result stringByAppendingFormat:@"int num = %i;\n", [points count]];
146146
}
147147

148148
for (int p = 0; p < [points count]; p++) {
@@ -159,13 +159,13 @@ - (void)updateResultTextField
159159
break;
160160
case VHSTYLE_INIT:
161161
if (p == 0) {
162-
result = [result stringByAppendingFormat:@"b2Vec2 %@[] = {", variableName];
162+
result = [result stringByAppendingFormat:@"b2Vec2 %@[] = {\n", variableName];
163163
}
164164

165-
result = [result stringByAppendingFormat:@"b2Vec2(%@)", itemString];
165+
result = [result stringByAppendingFormat:@" b2Vec2(%@)", itemString];
166166

167167
if (p + 1 == [points count]) {
168-
result = [result stringByAppendingString:@"};\n"];
168+
result = [result stringByAppendingString:@"\n};\n"];
169169
} else {
170170
result = [result stringByAppendingString:@",\n"];
171171
}
@@ -177,20 +177,20 @@ - (void)updateResultTextField
177177

178178
break;
179179
case VHTYPE_CHIPMUNK:
180-
itemString = [NSString stringWithFormat:@"cpv(%.1ff, %.1ff)", point.x, point.y];
180+
itemString = [NSString stringWithFormat:@" cpv(%.1ff, %.1ff)", point.x, point.y];
181181
switch ([stylePopUpButton selectedTag]) {
182182
case VHSTYLE_ASSIGN:
183183
result = [result stringByAppendingFormat:@"%@[%i] = %@;\n", variableName, p, itemString];
184184
break;
185185
case VHSTYLE_INIT:
186186
if (p == 0) {
187-
result = [result stringByAppendingFormat:@"CGPoint %@[] = {", variableName];
187+
result = [result stringByAppendingFormat:@"CGPoint %@[] = {\n", variableName];
188188
}
189189

190190
result = [result stringByAppendingString:itemString];
191191

192192
if (p + 1 == [points count]) {
193-
result = [result stringByAppendingString:@"};\n"];
193+
result = [result stringByAppendingString:@"\n};\n"];
194194
} else {
195195
result = [result stringByAppendingString:@",\n"];
196196
}

0 commit comments

Comments
 (0)