Merge pull request #17 from tuarua/development

Development
tuarua · Mar 6, 2020 · 4bc2a82 · 4bc2a82
2 parents 1674aaa + 2d43915
commit 4bc2a82
Show file tree

Hide file tree

Showing 62 changed files with 5,030 additions and 611 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### 1.3.0
+- AND: Updated to FreKotlin 1.9.5
+- ANE: `vibrator.android::vibrate()` now takes `VibrationEffect` param
+- iOS: Updated to FreSwift 4.3.0
+- iOS: Add HapticEngine support for iOS 13.0+
+
 ### 1.2.0
 - AND: Updated to FreKotlin 1.8.0
 - Updated to AIR 33 ARM 64bit

diff --git a/README.md b/README.md
@@ -63,11 +63,11 @@ You should use AIR 32 for iOS builds
 
 You will need:
 
-- IntelliJ IDEA / Flash Builder
-- AIR 32 or greater
+- IntelliJ IDEA
+- AIR 33.0.2.338+
+- Xcode 11.3
+- wget on macOS via `brew install wget`
 - Android Studio 3 if you wish to edit the Android source
-- Xcode 10.1
-- wget on macOS
 - Powershell on Windows
 
 ### References

diff --git a/example/.actionScriptProperties b/example/.actionScriptProperties
diff --git a/.../libraries/com_tuarua_frekotlin_1_8_0.xml → .../libraries/com_tuarua_frekotlin_1_9_5.xml b/.../libraries/com_tuarua_frekotlin_1_8_0.xml → .../libraries/com_tuarua_frekotlin_1_9_5.xml
diff --git a/example/.project b/example/.project
diff --git a/example/VibrationANESample.iml b/example/VibrationANESample.iml
@@ -11,7 +11,7 @@
             <entry library-name="VibrationANE" library-level="project">
               <dependency linkage="Merged" />
             </entry>
-            <entry library-name="com.tuarua.frekotlin-1.8.0" library-level="project">
+            <entry library-name="com.tuarua.frekotlin-1.9.5" library-level="project">
               <dependency linkage="Merged" />
             </entry>
           </entries>
@@ -46,7 +46,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_32" />
+          <sdk name="AIRSDK_33" />
         </dependencies>
         <compiler-options>
           <map>
@@ -60,8 +60,9 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/ios_dependencies/simulator" path-in-package="." />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/src/Assets.car" path-in-package="Assets.car" />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system" path-in-package="." />
+            <FilePathAndPathInPackage file-path="$MODULE_DIR$/assets" path-in-package="." />
           </files-to-package>
-          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2019/dev/tua_rua_dev_2019.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2019/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
+          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/tua_rua_dev_2020.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
         </packaging-ios>
       </configuration>
       <configuration name="iOS Device" target-platform="Mobile" pure-as="true" main-class="Main" output-file="iOS_Device.swf" output-folder="$MODULE_DIR$/bin-release">
@@ -74,7 +75,7 @@
               <dependency linkage="Merged" />
             </entry>
           </entries>
-          <sdk name="AIRSDK_32" />
+          <sdk name="AIRSDK_33" />
         </dependencies>
         <compiler-options>
           <map>
@@ -88,8 +89,9 @@
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/ios_dependencies/device" path-in-package="." />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/src/Assets.car" path-in-package="Assets.car" />
             <FilePathAndPathInPackage file-path="$MODULE_DIR$/system" path-in-package="." />
+            <FilePathAndPathInPackage file-path="$MODULE_DIR$/assets" path-in-package="." />
           </files-to-package>
-          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2018/dev/tua_rua_dev_2018.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2018/dev/Tua_Rua_Dev_Provisioning-2.mobileprovision" />
+          <AirSigningOptions keystore-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/tua_rua_dev_2020.p12" provisioning-profile-path="$USER_HOME$/Documents/appleCertsProv/2020/dev/Tua_Rua_Dev_Provisioning.mobileprovision" />
         </packaging-ios>
       </configuration>
     </configurations>
@@ -100,11 +102,12 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="AIRSDK_32&#9;AIRSDK_33" jdkType="__CompositeFlexSdk__" />
+    <orderEntry type="jdk" jdkName="AIRSDK_33" jdkType="Flex SDK Type (new)" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="starling" level="project" />
     <orderEntry type="library" exported="" name="com.tuarua.frekotlin" level="project" />
     <orderEntry type="library" exported="" name="VibrationANE" level="project" />
     <orderEntry type="library" exported="" name="com.tuarua.frekotlin-1.8.0" level="project" />
+    <orderEntry type="library" exported="" name="com.tuarua.frekotlin-1.9.5" level="project" />
   </component>
 </module>
diff --git a/example/assets/AHAP/Boing.ahap b/example/assets/AHAP/Boing.ahap
@@ -0,0 +1,62 @@
+{
+    "Version": 1.0,
+    "Metadata":
+        {
+            "Project" : "Haptic Sampler",
+            "Created" : "5 June 2019",
+            "Description" : "A continuous event tweaked by sloped parameter curves, emphasized by a precisely placed transient event, creating the feeling of a spring or rubberband."
+        },
+    "Pattern":
+    [
+        {
+            "Event":
+            {
+                "Time": 0.0,
+                "EventType": "HapticTransient",
+                "EventParameters":
+                [
+                    { "ParameterID": "HapticIntensity", "ParameterValue": 0.8 },
+                    { "ParameterID": "HapticSharpness", "ParameterValue": 0.4 }
+                ]
+            }
+        },
+        {
+            "Event":
+            {
+                "Time": 0.015,
+                "EventType": "HapticContinuous",
+                "EventDuration": 0.25,
+                "EventParameters":
+                [
+                    { "ParameterID": "HapticIntensity", "ParameterValue": 0.8 },
+                    { "ParameterID": "HapticSharpness", "ParameterValue": 0.4 }
+                ]
+            }
+        },
+        {
+            "ParameterCurve":
+            {
+                "ParameterID": "HapticIntensityControl",
+                "Time": 0.015,
+                "ParameterCurveControlPoints":
+                [
+                    { "Time": 0, "ParameterValue": 1 },
+                    { "Time": 0.1, "ParameterValue": 0.5 },
+                    { "Time": 0.25, "ParameterValue": 0.0 }
+                ]
+            }
+        },
+        {
+            "ParameterCurve":
+            {
+                "ParameterID": "HapticSharpnessControl",
+                "Time": 0.015,
+                "ParameterCurveControlPoints":
+                [
+                    { "Time": 0, "ParameterValue": 0.0 },
+                    { "Time": 0.25, "ParameterValue": -0.3 }
+                ]
+            }
+        }
+    ]
+}