@@ -190,37 +190,6 @@ <reference key="NSTextColor" ref="377116039"/> </object> </object> - <object class="NSButton" id="647670600"> - <reference key="NSNextResponder" ref="210126419"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{18, 69}, {159, 18}}</string> - <reference key="NSSuperview" ref="210126419"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="253873620"> - <int key="NSCellFlags">-2080244224</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Show Inst. Pointers</string> - <object class="NSFont" key="NSSupport" id="410377631"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">1.300000e+01</double> - <int key="NSfFlags">1044</int> - </object> - <reference key="NSControlView" ref="647670600"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">130</int> - <object class="NSCustomResource" key="NSNormalImage" id="231241830"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSSwitch</string> - </object> - <object class="NSButtonImageSource" key="NSAlternateImage" id="70249213"> - <string key="NSImageName">NSSwitch</string> - </object> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> <object class="NSTextField" id="613427103"> <reference key="NSNextResponder" ref="210126419"/> <int key="NSvFlags">289</int> @@ -301,14 +270,14 @@ <object class="NSTextField" id="28918850"> <reference key="NSNextResponder" ref="210126419"/> <int key="NSvFlags">292</int> - <string key="NSFrame">{{114, 20}, {95, 17}}</string> + <string key="NSFrame">{{87, 96}, {95, 14}}</string> <reference key="NSSuperview" ref="210126419"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="973508577"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272630784</int> + <int key="NSCellFlags2">272761856</int> <string key="NSContents">Label</string> - <reference key="NSSupport" ref="410377631"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="28918850"/> <reference key="NSBackgroundColor" ref="623501826"/> <reference key="NSTextColor" ref="377116039"/> @@ -324,7 +293,11 @@ <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">134217728</int> <string key="NSContents">Continue</string> - <reference key="NSSupport" ref="410377631"/> + <object class="NSFont" key="NSSupport" id="410377631"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">1.300000e+01</double> + <int key="NSfFlags">1044</int> + </object> <reference key="NSControlView" ref="303531258"/> <int key="NSButtonFlags">-2038284033</int> <int key="NSButtonFlags2">129</int> @@ -369,41 +342,19 @@ <object class="NSTextField" id="715595545"> <reference key="NSNextResponder" ref="210126419"/> <int key="NSvFlags">292</int> - <string key="NSFrame">{{17, 20}, {95, 17}}</string> + <string key="NSFrame">{{17, 96}, {68, 14}}</string> <reference key="NSSuperview" ref="210126419"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="759032910"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">71304192</int> + <int key="NSCellFlags2">71435264</int> <string key="NSContents">Creature:</string> - <reference key="NSSupport" ref="410377631"/> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="715595545"/> <reference key="NSBackgroundColor" ref="623501826"/> <reference key="NSTextColor" ref="377116039"/> </object> </object> - <object class="NSButton" id="894813019"> - <reference key="NSNextResponder" ref="210126419"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{18, 94}, {159, 18}}</string> - <reference key="NSSuperview" ref="210126419"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="105578229"> - <int key="NSCellFlags">-2080244224</int> - <int key="NSCellFlags2">0</int> - <string key="NSContents">Show Cells</string> - <reference key="NSSupport" ref="410377631"/> - <reference key="NSControlView" ref="894813019"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">130</int> - <reference key="NSNormalImage" ref="231241830"/> - <reference key="NSAlternateImage" ref="70249213"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> </object> <string key="NSFrameSize">{715, 590}</string> <reference key="NSSuperview" ref="267138535"/> @@ -2242,8 +2193,13 @@ <reference key="NSControlView" ref="598179573"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">130</int> - <reference key="NSNormalImage" ref="231241830"/> - <reference key="NSAlternateImage" ref="70249213"/> + <object class="NSCustomResource" key="NSNormalImage" id="782349421"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSSwitch</string> + </object> + <object class="NSButtonImageSource" key="NSAlternateImage" id="70249213"> + <string key="NSImageName">NSSwitch</string> + </object> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">200</int> @@ -4532,7 +4488,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSControlView" ref="855402750"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">130</int> - <reference key="NSNormalImage" ref="231241830"/> + <reference key="NSNormalImage" ref="782349421"/> <reference key="NSAlternateImage" ref="70249213"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -4806,7 +4762,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSControlView" ref="304981408"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">130</int> - <reference key="NSNormalImage" ref="231241830"/> + <reference key="NSNormalImage" ref="782349421"/> <reference key="NSAlternateImage" ref="70249213"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -4828,7 +4784,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSControlView" ref="470009185"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">130</int> - <reference key="NSNormalImage" ref="231241830"/> + <reference key="NSNormalImage" ref="782349421"/> <reference key="NSAlternateImage" ref="70249213"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -4850,7 +4806,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSControlView" ref="170750873"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">130</int> - <reference key="NSNormalImage" ref="231241830"/> + <reference key="NSNormalImage" ref="782349421"/> <reference key="NSAlternateImage" ref="70249213"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -4872,7 +4828,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSControlView" ref="912414213"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">130</int> - <reference key="NSNormalImage" ref="231241830"/> + <reference key="NSNormalImage" ref="782349421"/> <reference key="NSAlternateImage" ref="70249213"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -5362,38 +5318,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: soupView.showCells</string> - <reference key="source" ref="894813019"/> - <reference key="destination" ref="647581288"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="894813019"/> - <reference key="NSDestination" ref="647581288"/> - <string key="NSLabel">value: soupView.showCells</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">soupView.showCells</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">100172</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: soupView.showInstructionPointers</string> - <reference key="source" ref="647670600"/> - <reference key="destination" ref="647581288"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="647670600"/> - <reference key="NSDestination" ref="647581288"/> - <string key="NSLabel">value: soupView.showInstructionPointers</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">soupView.showInstructionPointers</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">100174</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">value: soupView.focusedCreatureName</string> <reference key="source" ref="28918850"/> <reference key="destination" ref="647581288"/> @@ -6438,6 +6362,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <int key="connectionID">100643</int> </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">mSoupView</string> + <reference key="source" ref="512844837"/> + <reference key="destination" ref="539492081"/> + </object> + <int key="connectionID">100644</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -8680,12 +8612,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="object" ref="210126419"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="894813019"/> - <reference ref="715595545"/> <reference ref="303531258"/> - <reference ref="28918850"/> <reference ref="613427103"/> - <reference ref="647670600"/> <reference ref="72783159"/> <reference ref="29555356"/> <reference ref="420888560"/> @@ -8696,24 +8624,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="489263839"/> <reference ref="38175545"/> <reference ref="917370141"/> + <reference ref="715595545"/> + <reference ref="28918850"/> </object> <reference key="parent" ref="267138535"/> </object> <object class="IBObjectRecord"> - <int key="objectID">100028</int> - <reference key="object" ref="894813019"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="105578229"/> - </object> - <reference key="parent" ref="210126419"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">100029</int> - <reference key="object" ref="105578229"/> - <reference key="parent" ref="894813019"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">100075</int> <reference key="object" ref="715595545"/> <object class="NSMutableArray" key="children"> @@ -8807,20 +8723,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="parent" ref="701583171"/> </object> <object class="IBObjectRecord"> - <int key="objectID">100030</int> - <reference key="object" ref="647670600"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="253873620"/> - </object> - <reference key="parent" ref="210126419"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">100031</int> - <reference key="object" ref="253873620"/> - <reference key="parent" ref="647670600"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">100046</int> <reference key="object" ref="72783159"/> <object class="NSMutableArray" key="children"> @@ -9024,10 +8926,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>100022.IBPluginDependency</string> <string>100025.IBPluginDependency</string> <string>100026.IBPluginDependency</string> - <string>100028.IBPluginDependency</string> - <string>100029.IBPluginDependency</string> - <string>100030.IBPluginDependency</string> - <string>100031.IBPluginDependency</string> <string>100042.IBPluginDependency</string> <string>100043.IBPluginDependency</string> <string>100044.IBPluginDependency</string> @@ -9449,10 +9347,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{138, 552}, {584, 420}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> @@ -9743,7 +9637,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">100643</int> + <int key="maxID">100644</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -9926,6 +9820,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>exportSettings:</string> <string>showSettings:</string> <string>step:</string> + <string>toggleCellsVisibility:</string> + <string>toggleFecundityVisibility:</string> + <string>toggleInstructionPointersVisibility:</string> <string>toggleRunning:</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -9934,11 +9831,23 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">worldController</string> - <string key="NS.object.0">MTWorldController</string> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>mSoupView</string> + <string>worldController</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>MTSoupView</string> + <string>MTWorldController</string> + </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> Resources/English.lproj/MacTierraDocument.xib @@ -642,6 +642,43 @@ <string key="NSTitle">View</string> <object class="NSMutableArray" key="NSMenuItems"> <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMenuItem" id="397328780"> + <reference key="NSMenu" ref="466310130"/> + <string key="NSTitle">Show Cells</string> + <string key="NSKeyEquiv">c</string> + <int key="NSKeyEquivModMask">1572864</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1033313550"/> + <reference key="NSMixedImage" ref="310636482"/> + </object> + <object class="NSMenuItem" id="805012765"> + <reference key="NSMenu" ref="466310130"/> + <string key="NSTitle">Show Instruction Pointers</string> + <string key="NSKeyEquiv">i</string> + <int key="NSKeyEquivModMask">1572864</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1033313550"/> + <reference key="NSMixedImage" ref="310636482"/> + </object> + <object class="NSMenuItem" id="139767299"> + <reference key="NSMenu" ref="466310130"/> + <string key="NSTitle">Show Fecundity</string> + <string key="NSKeyEquiv">f</string> + <int key="NSKeyEquivModMask">1572864</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1033313550"/> + <reference key="NSMixedImage" ref="310636482"/> + </object> + <object class="NSMenuItem" id="533905777"> + <reference key="NSMenu" ref="466310130"/> + <bool key="NSIsDisabled">YES</bool> + <bool key="NSIsSeparator">YES</bool> + <string key="NSTitle"/> + <string key="NSKeyEquiv"/> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="1033313550"/> + <reference key="NSMixedImage" ref="310636482"/> + </object> <object class="NSMenuItem" id="102151532"> <reference key="NSMenu" ref="466310130"/> <string key="NSTitle">Show Toolbar</string> @@ -1174,6 +1211,30 @@ </object> <int key="connectionID">536</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">toggleCellsVisibility:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="397328780"/> + </object> + <int key="connectionID">548</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">toggleInstructionPointersVisibility:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="805012765"/> + </object> + <int key="connectionID">549</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">toggleFecundityVisibility:</string> + <reference key="source" ref="1014"/> + <reference key="destination" ref="139767299"/> + </object> + <int key="connectionID">550</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1754,6 +1815,10 @@ <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="237841660"/> <reference ref="102151532"/> + <reference ref="533905777"/> + <reference ref="397328780"/> + <reference ref="805012765"/> + <reference ref="139767299"/> </object> <reference key="parent" ref="586577488"/> </object> @@ -1834,6 +1899,26 @@ <reference key="object" ref="916672251"/> <reference key="parent" ref="720053764"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">540</int> + <reference key="object" ref="533905777"/> + <reference key="parent" ref="466310130"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">545</int> + <reference key="object" ref="397328780"/> + <reference key="parent" ref="466310130"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">546</int> + <reference key="object" ref="805012765"/> + <reference key="parent" ref="466310130"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">547</int> + <reference key="object" ref="139767299"/> + <reference key="parent" ref="466310130"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -1995,6 +2080,10 @@ <string>532.IBPluginDependency</string> <string>534.IBPluginDependency</string> <string>535.IBPluginDependency</string> + <string>540.IBPluginDependency</string> + <string>545.IBPluginDependency</string> + <string>546.IBPluginDependency</string> + <string>547.IBPluginDependency</string> <string>56.IBPluginDependency</string> <string>56.ImportedFromIB2</string> <string>57.IBEditorWindowLastContentRect</string> @@ -2145,7 +2234,7 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{525, 802}, {197, 73}}</string> - <string>{{436, 957}, {422, 20}}</string> + <string>{{299, 935}, {422, 20}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{74, 862}</string> @@ -2167,13 +2256,13 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{629, 957}, {234, 43}}</string> + <string>{{487, 822}, {265, 113}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{475, 832}, {234, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{674, 884}, {190, 73}}</string> + <string>{{537, 862}, {190, 73}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{475, 832}, {234, 43}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2188,6 +2277,10 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <reference ref="9"/> <string>{{328, 608}, {206, 183}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -2243,7 +2336,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">536</int> + <int key="maxID">550</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -2260,6 +2353,9 @@ <string>showGenebankWindow:</string> <string>showSettings:</string> <string>step:</string> + <string>toggleCellsVisibility:</string> + <string>toggleFecundityVisibility:</string> + <string>toggleInstructionPointersVisibility:</string> <string>toggleRunning:</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -2270,6 +2366,9 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> @@ -2314,18 +2413,34 @@ </object> </object> <object class="IBPartialClassDescription"> + <string key="className">MTGenotypeImageView</string> + <string key="superclassName">NSImageView</string> + <object class="NSMutableDictionary" key="outlets"> + <string key="NS.key.0">worldController</string> + <string key="NS.object.0">MTWorldController</string> + </object> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBProjectSource</string> + <string key="minorKey">Source/userinterface/cocoa/views/MTGenotypeImageView.h</string> + </object> + </object> + <object class="IBPartialClassDescription"> <string key="className">MTGraphController</string> <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>mGraphAdditionsView</string> <string>mGraphContainerView</string> + <string>mGraphsArrayController</string> <string>mWorldController</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>NSView</string> + <string>NSView</string> + <string>NSArrayController</string> <string>MTWorldController</string> </object> </object> @@ -2350,8 +2465,17 @@ <string key="className">MTSoupView</string> <string key="superclassName">MTCompositedGLView</string> <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">mWorldController</string> - <string key="NS.object.0">MTWorldController</string> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>mGenotypesArrayController</string> + <string>mWorldController</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSArrayController</string> + <string>MTWorldController</string> + </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> @@ -2396,9 +2520,12 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>document</string> <string>mCreatureSoupView</string> + <string>mDebugGenotypeImageView</string> <string>mGraphController</string> + <string>mInspectGenotypeImageView</string> <string>mInventoryController</string> <string>mInventoryTableView</string> + <string>mSelectedCreatureController</string> <string>mSettingsPanel</string> <string>mSoupView</string> </object> @@ -2406,9 +2533,12 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>NSDocument</string> <string>NSTextView</string> + <string>MTGenotypeImageView</string> <string>MTGraphController</string> + <string>MTGenotypeImageView</string> <string>MTInventoryController</string> <string>NSTableView</string> + <string>NSObjectController</string> <string>NSPanel</string> <string>MTSoupView</string> </object> @@ -2428,6 +2558,9 @@ <string>exportSettings:</string> <string>showSettings:</string> <string>step:</string> + <string>toggleCellsVisibility:</string> + <string>toggleFecundityVisibility:</string> + <string>toggleInstructionPointersVisibility:</string> <string>toggleRunning:</string> </object> <object class="NSMutableArray" key="dict.values"> @@ -2436,11 +2569,23 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> - <string key="NS.key.0">worldController</string> - <string key="NS.object.0">MTWorldController</string> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>mSoupView</string> + <string>worldController</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>MTSoupView</string> + <string>MTWorldController</string> + </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> Resources/English.lproj/MainMenu.xib Resources/Localizable.strings @@ -9,14 +9,16 @@ #import <Cocoa/Cocoa.h> -@class MTWorldController; - extern NSString* const kBinarySoupDocumentType; extern NSString* const kXMLSoupDocumentType; +@class MTWorldController; +@class MTSoupView; + @interface MacTierraDocument : NSDocument { IBOutlet MTWorldController* worldController; + IBOutlet MTSoupView* mSoupView; BOOL startEmpty; @@ -36,4 +38,8 @@ extern NSString* const kXMLSoupDocumentType; - (IBAction)toggleRunning:(id)sender; - (IBAction)step:(id)sender; +- (IBAction)toggleCellsVisibility:(id)sender; +- (IBAction)toggleInstructionPointersVisibility:(id)sender; +- (IBAction)toggleFecundityVisibility:(id)sender; + @end Source/userinterface/cocoa/document/MacTierraDocument.h @@ -11,13 +11,14 @@ #include <iostream> #include <fstream> +#import "MTSoupView.h" #import "MTDocumentController.h" #import "MTWorldController.h" -NSString* const kBinarySoupDocumentType = @"SoupDocumentType"; // has to match the plist -NSString* const kXMLSoupDocumentType = @"XMLSoupDocumentType"; // has to match the plist +NSString* const kBinarySoupDocumentType = @"SoupDocumentType"; // has to match the plist +NSString* const kXMLSoupDocumentType = @"XMLSoupDocumentType"; // has to match the plist -NSString* const kMacTierraErrorDomain = @"org.smfr.mactierra.error-domain"; +NSString* const kMacTierraErrorDomain = @"org.smfr.mactierra.error-domain"; @implementation MacTierraDocument @@ -167,4 +168,50 @@ NSString* const kMacTierraErrorDomain = @"org.smfr.mactierra.error-domain"; [worldController step:sender]; } +- (IBAction)toggleCellsVisibility:(id)sender +{ + mSoupView.showCells = !mSoupView.showCells; +} + +- (IBAction)toggleInstructionPointersVisibility:(id)sender +{ + mSoupView.showInstructionPointers = !mSoupView.showInstructionPointers; +} + +- (IBAction)toggleFecundityVisibility:(id)sender +{ + mSoupView.showFecundity = !mSoupView.showFecundity; +} + +#pragma mark - + +- (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)anItem +{ + if ([anItem action] == @selector(toggleCellsVisibility:)) + { + if ([(NSObject*)anItem isKindOfClass:[NSMenuItem self]]) + [(NSMenuItem*)anItem setTitle:mSoupView.showCells ? NSLocalizedString(@"HideCells", @"") : NSLocalizedString(@"ShowCells", @"")]; + + return YES; + } + + if ([anItem action] == @selector(toggleInstructionPointersVisibility:)) + { + if ([(NSObject*)anItem isKindOfClass:[NSMenuItem self]]) + [(NSMenuItem*)anItem setTitle:mSoupView.showInstructionPointers ? NSLocalizedString(@"HideInstructionPointers", @"") : NSLocalizedString(@"ShowInstructionPointers", @"")]; + + return YES; + } + + if ([anItem action] == @selector(toggleFecundityVisibility:)) + { + if ([(NSObject*)anItem isKindOfClass:[NSMenuItem self]]) + [(NSMenuItem*)anItem setTitle:mSoupView.showFecundity ? NSLocalizedString(@"HideFecundity", @"") : NSLocalizedString(@"ShowFecundity", @"")]; + + return YES; + } + + return YES; +} + @end Source/userinterface/cocoa/document/MacTierraDocument.mm @@ -29,6 +29,7 @@ namespace MacTierra { BOOL zoomToFit; BOOL showCells; BOOL showInstructionPointers; + BOOL showFecundity; NSString* focusedCreatureName; @@ -40,6 +41,7 @@ namespace MacTierra { @property (assign) BOOL zoomToFit; @property (assign) BOOL showCells; @property (assign) BOOL showInstructionPointers; +@property (assign) BOOL showFecundity; @property (assign) NSString* focusedCreatureName; Source/userinterface/cocoa/views/MTSoupView.h @@ -6,6 +6,8 @@ // Copyright 2008 __MyCompanyName__. All rights reserved. // +#import <algorithm> + #import "MTSoupView.h" #import "NSArrayAdditions.h" @@ -24,6 +26,7 @@ using namespace MacTierra; - (void)setScalingCTM; - (void)drawCells:(NSRect)inDirtyRect; +- (void)drawFecundity:(NSRect)inDirtyRect; - (void)drawInstructionPointers:(NSRect)inDirtyRect; - (CGRect)soupRect; @@ -48,6 +51,7 @@ using namespace MacTierra; @synthesize zoomToFit; @synthesize showCells; @synthesize showInstructionPointers; +@synthesize showFecundity; @synthesize focusedCreatureName; - (id)initWithFrame:(NSRect)inFrame @@ -101,8 +105,10 @@ using namespace MacTierra; { if (inShow != showCells) { + [self willChangeValueForKey:@"showCells"]; showCells = inShow; [self setNeedsDisplay:YES]; + [self didChangeValueForKey:@"showCells"]; } } @@ -110,8 +116,21 @@ using namespace MacTierra; { if (inShow != showInstructionPointers) { + [self willChangeValueForKey:@"showInstructionPointers"]; showInstructionPointers = inShow; [self setNeedsDisplay:YES]; + [self didChangeValueForKey:@"showInstructionPointers"]; + } +} + +- (void)setShowFecundity:(BOOL)inShow +{ + if (inShow != showFecundity) + { + [self willChangeValueForKey:@"showFecundity"]; + showFecundity = inShow; + [self setNeedsDisplay:YES]; + [self didChangeValueForKey:@"showFecundity"]; } } @@ -140,13 +159,15 @@ using namespace MacTierra; [NSGraphicsContext saveGraphicsState]; [self setScalingCTM]; - if (showInstructionPointers) + if (showInstructionPointers || showFecundity || showCells) { [[NSColor colorWithCalibratedWhite:0.0f alpha:0.5f] set]; NSRectFill(NSMakeRect(0, 0, mSoupWidth, mSoupHeight)); } - if (showCells) + if (showFecundity) + [self drawFecundity:inDirtyRect]; + else if (showCells) [self drawCells:inDirtyRect]; if (showInstructionPointers) @@ -248,6 +269,87 @@ using namespace MacTierra; } } +- (NSColor*)colorForOffspring:(NSInteger)inNumOffspring identicalOffspring:(NSInteger)inIdenticalOffspring +{ + // TODO: blend of yellow and red + + const float kSingleOffspringOpacity = 0.3; + const NSInteger kMaxFecundity = 10; + + float opacity = kSingleOffspringOpacity + (1.0 - kSingleOffspringOpacity) * (std::min(inNumOffspring, kMaxFecundity) / (float)kMaxFecundity); + float identicalFraction = std::min(inIdenticalOffspring, kMaxFecundity) / (float)kMaxFecundity; + + return [NSColor colorWithCalibratedRed:1.0 green:identicalFraction blue:0 alpha:opacity]; +} + +- (void)drawFecundity:(NSRect)inDirtyRect +{ + if (!mWorld) + return; + + CGContextRef cgContext = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort]; + + CGContextSetLineWidth(cgContext, 1.0f); + + CellMap* cellMap = mWorld->cellMap(); + const u_int32_t soupSize = mWorld->soupSize(); + + CellMap::CreatureList::const_iterator iterEnd = cellMap->cells().end(); + for (CellMap::CreatureList::const_iterator it = cellMap->cells().begin(); it != iterEnd; ++it) + { + const CreatureRange& curCell = *it; + const Creature* curCreature = curCell.mData; + + if (curCreature->isEmbryo() || curCreature->numOffspring() == 0) + continue; + + int startLine = curCell.start() / mSoupWidth; + int endLine = curCell.wrappedEnd(soupSize) / mSoupWidth; + + int startCol = curCell.start() % mSoupWidth; + int endCol = curCell.wrappedEnd(soupSize) % mSoupWidth; + + CGContextBeginPath(cgContext); + + if (curCell.wraps(soupSize)) + { + int numLines = mSoupHeight; + + for (int i = startLine; i < numLines; ++i) + { + CGPoint startPoint = CGPointMake((i == startLine) ? startCol : 0, i); + CGPoint endPoint = CGPointMake(mSoupWidth, i); + + CGContextMoveToPoint(cgContext, startPoint.x, startPoint.y + 0.5); + CGContextAddLineToPoint(cgContext, endPoint.x, endPoint.y + 0.5); + } + + for (int i = 0; i <= endLine; ++i) + { + CGPoint startPoint = CGPointMake(0, i); + CGPoint endPoint = CGPointMake((i == endLine) ? endCol : mSoupWidth, i); + + CGContextMoveToPoint(cgContext, startPoint.x, startPoint.y + 0.5); + CGContextAddLineToPoint(cgContext, endPoint.x, endPoint.y + 0.5); + } + } + else + { + for (int i = startLine; i <= endLine; ++i) + { + CGPoint startPoint = CGPointMake((i == startLine) ? startCol : 0, i); + CGPoint endPoint = CGPointMake((i == endLine) ? endCol : mSoupWidth, i); + + CGContextMoveToPoint(cgContext, startPoint.x, startPoint.y + 0.5); + CGContextAddLineToPoint(cgContext, endPoint.x, endPoint.y + 0.5); + } + } + + [[self colorForOffspring:curCreature->numOffspring() identicalOffspring:curCreature->numIdenticalOffspring()] set]; + CGContextStrokePath(cgContext); + } +} + - (void)drawInstructionPointers:(NSRect)inDirtyRect { if (!mWorld) Source/userinterface/cocoa/views/MTSoupView.mm 288960bb8fc8c96419a8904f5d3b0322f89f70bc Simon Fraser simon.fraser@apple.com http://github.com/smfr/mactierra/commit/9ad5aaf6ac7443bd41c8d435e840f3496973cf98 9ad5aaf6ac7443bd41c8d435e840f3496973cf98 2008-11-02T09:35:27-08:00 2008-11-02T09:35:27-08:00 Add menu items for the soup overlay options, and add a "fecundity" overlay which shows which creatures are reproducing. b741395918d6a3edf3264fc2c81b5eeef7d09975 Simon Fraser simon.fraser@apple.com