Changeset 6db346c in orbit for iOS


Ignore:
Timestamp:
12/29/13 11:24:57 (6 years ago)
Author:
Steve Castellotti <sc@…>
Branches:
master, Servo
Children:
d42b042
Parents:
4c86e4a
Message:
  • Scoring fields added
  • Tilt Control widgets added
Location:
iOS/Orbit
Files:
14 edited

Legend:

Unmodified
Added
Removed
  • iOS/Orbit/Orbit/AudioGenerator.h

    rce0a7ee r6db346c  
    33//  orbit 
    44// 
    5 //  Created by Jonathon Horsman on 19/07/2013. 
    65//  Copyright (c) 2013 Puzzlebox Productions, LLC. All rights reserved. 
     6//  Originally created by Jonathon Horsman. 
     7// 
     8//  This code is released under the GNU Public License (GPL) version 2 
     9//  For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    710// 
    811 
  • iOS/Orbit/Orbit/AudioGenerator.m

    r37ca4e8 r6db346c  
    33//  orbit 
    44// 
    5 //  Created by Jonathon Horsman on 19/07/2013. 
    65//  Copyright (c) 2013 Puzzlebox Productions, LLC. All rights reserved. 
     6//  Originally created by Jonathon Horsman. 
     7// 
     8//  This code is released under the GNU Public License (GPL) version 2 
     9//  For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    710// 
    811 
  • iOS/Orbit/Orbit/SignalConverter.h

    rc9b9edd r6db346c  
    33//  orbit 
    44// 
    5 //  Created by Jonathon Horsman on 11/07/2013. 
    65//  Copyright (c) 2013 Puzzlebox Productions, LLC. All rights reserved. 
     6//  Originally created by Jonathon Horsman. 
     7// 
     8//  This code is released under the GNU Public License (GPL) version 2 
     9//  For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    710// 
    811 
  • iOS/Orbit/Orbit/SignalConverter.m

    re6618f3 r6db346c  
    33//  orbit 
    44// 
    5 //  Created by Jonathon Horsman on 11/07/2013. 
    65//  Copyright (c) 2013 Puzzlebox Productions, LLC. All rights reserved. 
     6//  Originally created by Jonathon Horsman. 
     7// 
     8//  This code is released under the GNU Public License (GPL) version 2 
     9//  For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    710// 
    811 
  • iOS/Orbit/Orbit/SignalConverterDelegate.h

    r9015b1e r6db346c  
    33//  orbit 
    44// 
    5 //  Created by Jonathon Horsman on 11/07/2013. 
    65//  Copyright (c) 2013 Puzzlebox Productions, LLC. All rights reserved. 
     6//  Originally created by Jonathon Horsman. 
     7// 
     8//  This code is released under the GNU Public License (GPL) version 2 
     9//  For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    710// 
    811 
  • iOS/Orbit/Orbit/controllers/AdvancedViewController.h

    rde10cbc r6db346c  
    33//  orbit 
    44// 
    5 //  Created by Jonathon Horsman on 11/07/2013. 
    65//  Copyright (c) 2013 Puzzlebox Productions, LLC. All rights reserved. 
     6//  Originally created by Jonathon Horsman. 
     7// 
     8//  This code is released under the GNU Public License (GPL) version 2 
     9//  For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    710// 
    811 
  • iOS/Orbit/Orbit/controllers/AdvancedViewController.m

    r37ca4e8 r6db346c  
    33//  orbit 
    44// 
    5 //  Created by Jonathon Horsman on 11/07/2013. 
    65//  Copyright (c) 2013 Puzzlebox Productions, LLC. All rights reserved. 
     6//  Originally created by Jonathon Horsman. 
     7// 
     8//  This code is released under the GNU Public License (GPL) version 2 
     9//  For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    710// 
    811 
     
    2932//   UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Help Wanted" message:@"Please join our Open Source development community to help us port this feature! See link to Forums under Support tab" delegate:nil cancelButtonTitle:@"OK" otherButtonTitles: nil]; 
    3033//   [alert show]; 
     34    
     35    
     36   UISwitch *switchTiltSensorControl = [[UISwitch alloc] initWithFrame:CGRectMake(10, 310, 0, 0)]; 
     37   [switchTiltSensorControl addTarget:self action:@selector(changeSwitchTiltSensorControl:) forControlEvents:UIControlEventValueChanged]; 
     38   [self.view addSubview:switchTiltSensorControl]; 
     39    
     40   UISwitch *switchTiltSensorControlThrottle = [[UISwitch alloc] initWithFrame:CGRectMake(148, 310, 0, 0)]; 
     41   [switchTiltSensorControlThrottle addTarget:self action:@selector(changeSwitchTiltSensorControlThrottle:) forControlEvents:UIControlEventValueChanged]; 
     42   [self.view addSubview:switchTiltSensorControlThrottle]; 
     43    
    3144} 
    3245 
     
    8699} 
    87100 
     101- (void)changeSwitchTiltSensorControl:(id)sender{ 
     102    
     103   if([sender isOn]){ 
     104      NSLog(@"DEBUG: Tilt Sensor Enabled"); 
     105   } else{ 
     106      NSLog(@"DEBUG: Tilt Sensor Disabled"); 
     107   } 
     108    
     109} 
     110 
     111- (void)changeSwitchTiltSensorControlThrottle:(id)sender{ 
     112    
     113   if([sender isOn]){ 
     114      NSLog(@"DEBUG: Throttle Tilt Sensor Enabled"); 
     115   } else{ 
     116      NSLog(@"DEBUG: Throttle Tilt Sensor Disabled"); 
     117   } 
     118    
     119} 
     120 
    88121@end 
  • iOS/Orbit/Orbit/controllers/FlightViewController.h

    r8a0f920f r6db346c  
    33//  Orbit 
    44// 
    5 //  Created by Jonathon Horsman on 10/07/2013. 
    65//  Copyright (c) 2013 Puzzlebox Productions, LLC. All rights reserved. 
     6//  Originally created by Jonathon Horsman. 
     7// 
     8//  This code is released under the GNU Public License (GPL) version 2 
     9//  For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    710// 
    811 
  • iOS/Orbit/Orbit/controllers/SupportViewController.h

    rab9d63b r6db346c  
    33//  orbit 
    44// 
    5 //  Created by Jonathon Horsman on 11/07/2013. 
    65//  Copyright (c) 2013 Puzzlebox Productions, LLC. All rights reserved. 
     6//  Originally created by Jonathon Horsman. 
     7// 
     8//  This code is released under the GNU Public License (GPL) version 2 
     9//  For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    710// 
    811 
  • iOS/Orbit/Orbit/controllers/SupportViewController.m

    r5d87396 r6db346c  
    33//  orbit 
    44// 
    5 //  Created by Jonathon Horsman on 11/07/2013. 
    65//  Copyright (c) 2013 Puzzlebox Productions, LLC. All rights reserved. 
     6//  Originally created by Jonathon Horsman. 
     7// 
     8//  This code is released under the GNU Public License (GPL) version 2 
     9//  For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    710// 
    811 
  • iOS/Orbit/Orbit/controllers/TutorialViewController.h

    rab9d63b r6db346c  
    33//  Orbit 
    44// 
    5 //  Created by Jonathon Horsman on 09/07/2013. 
    65//  Copyright (c) 2013 Puzzlebox Productions, LLC. All rights reserved. 
     6//  Originally created by Jonathon Horsman. 
     7// 
     8//  This code is released under the GNU Public License (GPL) version 2 
     9//  For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    710// 
    811 
  • iOS/Orbit/Orbit/controllers/TutorialViewController.m

    r548a60f r6db346c  
    33//  Orbit 
    44// 
    5 //  Created by Jonathon Horsman on 09/07/2013. 
    65//  Copyright (c) 2013 Puzzlebox Productions, LLC. All rights reserved. 
     6//  Originally created by Jonathon Horsman. 
     7// 
     8//  This code is released under the GNU Public License (GPL) version 2 
     9//  For more information please refer to http://www.gnu.org/copyleft/gpl.html 
    710// 
    811 
  • iOS/Orbit/Orbit/en.lproj/MainStoryboard.storyboard

    r53a64a0 r6db346c  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?> 
    2 <document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="T1J-Fd-fkz"> 
     2<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="T1J-Fd-fkz"> 
    33    <dependencies> 
    44        <deployment defaultVersion="1536" identifier="iOS"/> 
    5         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3746"/> 
     5        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3747"/> 
    66    </dependencies> 
    77    <scenes> 
     
    7171                        <subviews> 
    7272                            <view contentMode="scaleToFill" id="zCb-D8-025" userLabel="Throttle Box"> 
    73                                 <rect key="frame" x="5" y="46" width="310" height="100"/> 
     73                                <rect key="frame" x="5" y="46" width="310" height="75"/> 
    7474                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 
    7575                                <subviews> 
     
    8888                                        </connections> 
    8989                                    </slider> 
    90                                     <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="Controls how quickly the Orbit will fly up when activated" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ARo-km-5lV"> 
    91                                         <rect key="frame" x="10" y="47" width="300" height="40"/> 
     90                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="Controls how quickly the Orbit will fly up" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ARo-km-5lV"> 
     91                                        <rect key="frame" x="6" y="47" width="304" height="20"/> 
    9292                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    9393                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    104104                            </view> 
    105105                            <view contentMode="scaleToFill" id="5aV-7g-jF0" userLabel="Yaw Box"> 
    106                                 <rect key="frame" x="5" y="156" width="310" height="100"/> 
     106                                <rect key="frame" x="5" y="129" width="310" height="75"/> 
    107107                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 
    108108                                <subviews> 
     
    122122                                    </slider> 
    123123                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="Controls right and left rotation of the Orbit" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="s3x-YJ-Fr2"> 
    124                                         <rect key="frame" x="10" y="47" width="300" height="40"/> 
     124                                        <rect key="frame" x="10" y="47" width="300" height="20"/> 
    125125                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    126126                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    137137                            </view> 
    138138                            <view contentMode="scaleToFill" id="EIx-J4-YAd" userLabel="Pitch Box"> 
    139                                 <rect key="frame" x="5" y="266" width="310" height="100"/> 
     139                                <rect key="frame" x="5" y="212" width="310" height="75"/> 
    140140                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 
    141141                                <subviews> 
     
    155155                                    </slider> 
    156156                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="Controls forward and backward motion" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Vaw-x7-cTr"> 
    157                                         <rect key="frame" x="10" y="47" width="300" height="40"/> 
     157                                        <rect key="frame" x="10" y="47" width="300" height="20"/> 
    158158                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    159159                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    182182                                </items> 
    183183                            </navigationBar> 
     184                            <view contentMode="scaleToFill" id="1fw-2n-Flv" userLabel="Pitch Box"> 
     185                                <rect key="frame" x="5" y="295" width="310" height="60"/> 
     186                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 
     187                                <subviews> 
     188                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Tilt Control" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Tv8-yP-KY5"> 
     189                                        <rect key="frame" x="59" y="20" width="80" height="20"/> 
     190                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 
     191                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     192                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> 
     193                                        <nil key="highlightedColor"/> 
     194                                    </label> 
     195                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="center" text="Throttle Only" lineBreakMode="wordWrap" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="tJc-ay-Cff"> 
     196                                        <rect key="frame" x="199" y="20" width="91" height="20"/> 
     197                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
     198                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     199                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> 
     200                                        <nil key="highlightedColor"/> 
     201                                    </label> 
     202                                </subviews> 
     203                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> 
     204                                <userDefinedRuntimeAttributes> 
     205                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> 
     206                                        <real key="value" value="5"/> 
     207                                    </userDefinedRuntimeAttribute> 
     208                                </userDefinedRuntimeAttributes> 
     209                            </view> 
    184210                        </subviews> 
    185211                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/> 
     
    240266                                    </progressView> 
    241267                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="bZn-rG-svm" userLabel="Attention %"> 
    242                                         <rect key="frame" x="267.99999986588949" y="22" width="24" height="18"/> 
     268                                        <rect key="frame" x="268" y="22" width="23.999999779723751" height="18"/> 
    243269                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    244270                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    310336                                    </progressView> 
    311337                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="yYn-76-IoI" userLabel="Signal %"> 
    312                                         <rect key="frame" x="267.99999986588949" y="19" width="24" height="18"/> 
     338                                        <rect key="frame" x="267.99999957235769" y="19" width="24" height="18"/> 
    313339                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    314340                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    329355                                    </progressView> 
    330356                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="0%" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="ah9-c0-kCb" userLabel="Power %"> 
    331                                         <rect key="frame" x="267.99999986588949" y="47" width="24" height="18"/> 
     357                                        <rect key="frame" x="267.99999957235769" y="47" width="24" height="18"/> 
    332358                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/> 
    333359                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     
    347373                            </view> 
    348374                            <view contentMode="scaleToFill" id="lfi-AW-BAx"> 
    349                                 <rect key="frame" x="5" y="290" width="310" height="132"/> 
     375                                <rect key="frame" x="5" y="324" width="310" height="98"/> 
    350376                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 
    351377                                <subviews> 
    352378                                    <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" image="status_0.png" id="aa9-oz-0Qj"> 
    353                                         <rect key="frame" x="5" y="32" width="300" height="67"/> 
     379                                        <rect key="frame" x="5" y="14" width="300" height="67"/> 
    354380                                        <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 
    355381                                    </imageView> 
    356382                                </subviews> 
    357383                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/> 
     384                                <userDefinedRuntimeAttributes> 
     385                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> 
     386                                        <real key="value" value="5"/> 
     387                                    </userDefinedRuntimeAttribute> 
     388                                </userDefinedRuntimeAttributes> 
     389                            </view> 
     390                            <view contentMode="scaleToFill" id="NjG-ud-uxt" userLabel="Meditation Background"> 
     391                                <rect key="frame" x="5" y="290" width="310" height="26"/> 
     392                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 
     393                                <subviews> 
     394                                    <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Scores        Current: 0    Last: 0    High: 0" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="N4q-gC-eyc"> 
     395                                        <rect key="frame" x="8" y="3" width="295" height="20"/> 
     396                                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/> 
     397                                        <fontDescription key="fontDescription" type="system" pointSize="14"/> 
     398                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/> 
     399                                        <nil key="highlightedColor"/> 
     400                                    </label> 
     401                                </subviews> 
     402                                <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/> 
    358403                                <userDefinedRuntimeAttributes> 
    359404                                    <userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius"> 
Note: See TracChangeset for help on using the changeset viewer.