nrinas/Cube4Fun
1
0
Fork 0
mirror of https://github.com/workinghard/Cube4Fun.git synced 2025-12-13 20:32:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

a

Browse Source
This commit is contained in:
workinghard
2015-04-21 23:56:00 -07:00
parent 855cd3dade
commit 8b0bc362fa
4 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Cube4Fun/Animations.swift
View File

@@ -94,12 +94,13 @@ class Animations: NSObject {
_animationArray.append(animArray[i] as! NSMutableDictionary)
//println("append Animation count: \(_animationArray.count)")
}
self.setSelectedAnimationID(0)
_gameView.resetView()
__tableView.reloadData()
}
func getAnimation(id: Int) -> (NSDictionary) {
println(_animationArray.count)
//println(_animationArray.count)
let myAnimation = _animationArray[id] as NSDictionary
return myAnimation
}
@@ -269,7 +270,7 @@ class Animations: NSObject {
}
func setLEDColor(color: UInt8, led: Int) {
println("Led pressed: \(led)")
//println("Led pressed: \(led)")
var myByte: [UInt8] = [color]
let myData: NSMutableData = (self.getAnimation(_animationSelected)).objectForKey(AnimFrames) as! NSMutableData
let bytePosition = NSMakeRange(((self.getAnimationFrameID()-1)*64)+led, 1)

9
Cube4Fun/AppDelegate.swift
View File

@@ -142,4 +142,13 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSTextFieldDelegate {
}
}
}
@IBAction func cmdCopyPressed(send: AnyObject) {
println("cmd c pressed")
}
@IBAction func cmdPastePressed(send: AnyObject) {
println("cmd v pressed")
}
}

38
Cube4Fun/Base.lproj/MainMenu.xib
View File

@@ -40,7 +40,7 @@
<menuItem isSeparatorItem="YES" id="144">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Hide SceneKit Mac Template" keyEquivalent="h" id="134">
<menuItem title="Hide Cube4Fun" keyEquivalent="h" id="134">
<connections>
<action selector="hide:" target="-1" id="367"/>
</connections>
@@ -59,7 +59,7 @@
<menuItem isSeparatorItem="YES" id="149">
<modifierMask key="keyEquivalentModifierMask" command="YES"/>
</menuItem>
<menuItem title="Quit SceneKit Mac Template" keyEquivalent="q" id="136">
<menuItem title="Quit Cube4Fun" keyEquivalent="q" id="136">
<connections>
<action selector="terminate:" target="-3" id="449"/>
</connections>
@@ -151,12 +151,12 @@
</menuItem>
<menuItem title="Copy" keyEquivalent="c" id="197">
<connections>
<action selector="copy:" target="-1" id="224"/>
<action selector="cmdCopyPressed:" target="494" id="ncB-O2-9om"/>
</connections>
</menuItem>
<menuItem title="Paste" keyEquivalent="v" id="203">
<connections>
<action selector="paste:" target="-1" id="226"/>
<action selector="cmdPastePressed:" target="494" id="DVw-0V-wp5"/>
</connections>
</menuItem>
<menuItem title="Clear All" id="202">
@@ -509,7 +509,7 @@
<point key="canvasLocation" x="-98" y="-41"/>
</window>
<window title="Animations" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="P9J-nG-QID">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
<windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="335" y="390" width="575" height="451"/>
@@ -559,7 +559,7 @@
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
</tableColumn>
<tableColumn identifier="AnimDur" width="106" minWidth="10" maxWidth="3.4028234663852886e+38" id="cuc-7v-Huv">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Duration (min)">
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left" title="Duration (sec)">
<font key="font" metaFont="smallSystem"/>
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
@@ -631,24 +631,13 @@
</connections>
</button>
<button verticalHuggingPriority="750" id="nV0-RH-sJ4">
<rect key="frame" x="480" y="13" width="81" height="32"/>
<rect key="frame" x="459" y="13" width="102" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="push" title="Export" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PEl-nt-7zX">
<buttonCell key="cell" type="push" title="Download" bezelStyle="rounded" alignment="center" enabled="NO" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="PEl-nt-7zX">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<button verticalHuggingPriority="750" id="T8G-1e-2FV">
<rect key="frame" x="399" y="13" width="81" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="push" title="Import" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Kli-kZ-6PU">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="exportAnimations:" target="zTF-MA-6NT" id="Wqf-T8-ibb"/>
</connections>
</button>
<button verticalHuggingPriority="750" id="5ce-Cy-Wpt">
<rect key="frame" x="220" y="13" width="58" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -682,6 +671,17 @@
<action selector="delNewAnimation:" target="zTF-MA-6NT" id="TLj-Ja-Alc"/>
</connections>
</button>
<button verticalHuggingPriority="750" id="T8G-1e-2FV">
<rect key="frame" x="374" y="13" width="85" height="32"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
<buttonCell key="cell" type="push" title="Upload" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Kli-kZ-6PU">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="exportAnimations:" target="zTF-MA-6NT" id="Wqf-T8-ibb"/>
</connections>
</button>
</subviews>
</view>
<connections>

13
Cube4Fun/GameView.swift
View File

@@ -545,8 +545,19 @@ class GameView: SCNView {
super.mouseDragged(theEvent)
}
override func flagsChanged(theEvent: NSEvent) {
// println(theEvent.keyCode)
}
override func keyDown(theEvent: NSEvent) {
/*
if theEvent.modifierFlags & .CommandKeyMask != nil {
println("cmd pressed")
}
*/
switch (theEvent.keyCode) {
case 123:
self.rotateCamera(0.0, y: -0.1)