Permalink
Browse files

For v0.4

Squashed commit of the following:

commit ae0e7f1
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Tue Aug 7 22:42:36 2012 +0300

    New build target: apk with captive runtime

commit c7bb31e
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Tue Aug 7 22:41:51 2012 +0300

    Example for touch and gesture cancelation

    Couldn't really test that because of a AIR bug on Android

commit a71709f
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Tue Aug 7 22:41:01 2012 +0300

    Update example for improved SwipeGesture

commit ea7f7e9
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Tue Aug 7 22:40:23 2012 +0300

    MXML gesture definition example

commit fd55737
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Wed Jul 11 13:35:35 2012 +0300

    Change rotation values from degrees to radians

commit 6e818c5
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Thu Jul 5 10:19:09 2012 +0300

    Demo Gestouch fix in c2d31b743bbe0821d92dd815fc90f2b2b0071f83

commit 89f75ab
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Wed Jul 4 21:52:20 2012 +0300

    Update IDE files

    (sorry for not ignoring those)

commit 4427c7f
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Wed Jul 4 21:51:26 2012 +0300

    Cleanup build.xml

commit cafe1cb
Merge: 340a246 0e862b9
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Wed Jul 4 21:50:53 2012 +0300

    Merge branch 'refs/heads/features/starling' into develop

commit 0e862b9
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Wed Jul 4 21:50:32 2012 +0300

    Update for new API + one more example/test

commit 1b9573b
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Sun Mar 18 12:13:34 2012 +0200

    Fixes for simplified API

commit 17baeee
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Wed Mar 14 15:23:00 2012 +0200

    starling initial commit

commit 340a246
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Wed Mar 7 01:24:45 2012 +0200

    cleanup

commit 08f46c4
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Wed Mar 7 01:24:35 2012 +0200

    Examples for requireGestureToFail API

commit a1715db
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Wed Mar 7 01:24:07 2012 +0200

    Update to reflect SwipeGesture API changes

commit 7158fcf
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Tue Mar 6 10:08:32 2012 +0200

    Updates to reflect last API changes

commit 2659881
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Fri Feb 17 16:30:30 2012 +0200

    Revert "Update for recent API changes"

    This reverts commit 8ae3814.

commit 8ae3814
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Fri Feb 3 16:06:00 2012 +0200

    Update for recent API changes

commit fb5994c
Author: Pavel fljot <pavel.fljot@gmail.com>
Date:   Tue Nov 22 02:37:28 2011 +0200

    Examples for the new architecture
  • Loading branch information...
1 parent e06df55 commit 4d35bbc0065712d15c20bdaa9ad22007afea0e72 @fljot committed Aug 7, 2012
Showing with 1,294 additions and 167 deletions.
  1. +1 −0 .settings/com.powerflasher.fdt.classpath
  2. +4 −3 .settings/com.powerflasher.fdt.core.prefs
  3. BIN back-button.psd
  4. +2 −2 build.template.properties
  5. +87 −17 build.xml
  6. +2 −2 build/air/descriptor-template-app.xml
  7. +4 −5 build/android/descriptor-template-apk.xml
  8. +4 −5 build/iOS/descriptor-template-ipa.xml
  9. BIN libs/starling.swc
  10. BIN src/assets/images/back-button.png
  11. +6 −3 src/org/gestouch/examples/model/ExamplesModel.as
  12. +228 −0 src/org/gestouch/examples/starling/ConflictGesturesExample.as
  13. +81 −0 src/org/gestouch/examples/starling/StarlingExampleBase.as
  14. +63 −0 src/org/gestouch/examples/starling/TransformedViewportExample.as
  15. +1 −2 src/org/gestouch/examples/views/ConflictGesturesView.mxml
  16. +4 −11 src/org/gestouch/examples/views/ExampleViewBase.as
  17. +15 −4 src/org/gestouch/examples/views/GestouchExamplesHomeView.mxml
  18. +22 −13 src/org/gestouch/examples/views/LongPressGestureAdvancedView.mxml
  19. +1 −2 src/org/gestouch/examples/views/RotateGestureView.mxml
  20. +96 −0 src/org/gestouch/examples/views/StarlingExampleViewBase.as
  21. +1 −1 src/org/gestouch/examples/views/SwipeGestureView.mxml
  22. +27 −95 src/org/gestouch/examples/views/TapGestureView.mxml
  23. +1 −2 src/org/gestouch/examples/views/TransformGestureView.mxml
  24. +250 −0 src_external/fr/kouma/starling/utils/Stats.as
  25. +212 −0 src_external/fr/kouma/starling/utils/standard_07_55.fnt
  26. BIN src_external/fr/kouma/starling/utils/standard_07_55.png
  27. +182 −0 src_external/net/hires/debug/Stats.as
@@ -19,4 +19,5 @@
<AS3Classpath generateProblems="false" sdkBased="false" type="lib" useAsSharedCode="false">libs/MonsterDebuggerMobile.swc</AS3Classpath>
<AS3Classpath generateProblems="false" inclusion="complete" sdkBased="false" type="project" useAsSharedCode="false">Gestouch</AS3Classpath>
<AS3Classpath generateProblems="false" sdkBased="true" type="lib" useAsSharedCode="false">frameworks/libs/mx/mx.swc</AS3Classpath>
+ <AS3Classpath generateProblems="false" sdkBased="false" type="lib" useAsSharedCode="false">libs/starling.swc</AS3Classpath>
</AS3Classpath>
@@ -1,4 +1,5 @@
-#Mon Apr 25 18:42:57 EEST 2011
+#Sat Jun 30 16:36:50 EEST 2012
+AnesChanged=0
com.powerflasher.fdt.core.CompatiblePlayers=AIR_Debug_Launcher
com.powerflasher.fdt.core.CompilerArguments=-load-config\="{flexSDK}/frameworks/airmobile-config.xml"\n-target-player\={playerVersion}\n-library-path+\="{flexSDK}/frameworks/locale/en_US"
com.powerflasher.fdt.core.DefaultOutputFolder=bin
@@ -8,8 +9,8 @@ com.powerflasher.fdt.core.PassClasspath=true
com.powerflasher.fdt.core.PassMainclass=true
com.powerflasher.fdt.core.PassRsls=false
com.powerflasher.fdt.core.PassSwcs=true
-com.powerflasher.fdt.core.PlayerVersion=10.2
+com.powerflasher.fdt.core.PlayerVersion=11.1
com.powerflasher.fdt.core.ProjectTypeHint=Flex 4.5 Mobile
com.powerflasher.fdt.core.Runtime=AIR
-com.powerflasher.fdt.core.SdkName=Flex 4.5
+com.powerflasher.fdt.core.SdkName=Flex 4.6
eclipse.preferences.version=1
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,7 +1,7 @@
# IMPORTANT Change to your local system paths before using ANT
# Flex SDK related properties
-FLEX_HOME = path-to-flex-4.5-SDK#/Users/fljot/Development/SDKs/flex_sdk_4.5
+FLEX_HOME = path-to-flex-4.6-SDK(AIR 3.2)#/Users/fljot/Development/SDKs/flex_sdk_4.6
flexSDK.dir = ${FLEX_HOME}
flexSDK.adl = ${flexSDK.dir}/bin/adl
flexSDK.adt = ${flexSDK.dir}/lib/adt.jar
@@ -29,7 +29,7 @@ binrelease.dir = ${basedir}/bin
# Input
project.examplesPackage.dir = org/gestouch/examples
project.targetPlayerVersion = 10.2
-project.baseCompilerArguments = -default-size=800,600 --target-player=${project.targetPlayerVersion} -static-link-runtime-shared-libraries=true
+project.baseCompilerArguments = -default-size=800,600 --target-player=${project.targetPlayerVersion} -static-link-runtime-shared-libraries=true -swf-version=15
project.mobileCompilerArguments = -preloader=spark.preloaders.SplashScreen -theme="${flexSDK.dir}/frameworks/themes/Mobile/mobile.swc"
project.debugCompilerArguments = -define=CONFIG::Debug,true -define+=CONFIG::Release,false -verbose-stacktraces=true
project.releaseCompilerArguments = -define=CONFIG::Debug,false -define+=CONFIG::Release,true
View
104 build.xml
@@ -179,6 +179,58 @@
</java>
</target>
+
+ <target name="package.apk.captive" description="" depends="ide.resetCompiler">
+ <var name="example.name" value="GestouchExamples" />
+
+ <compile.release input="${project.examplesPackage.dir}/${example.name}.mxml"
+ output="${example.name}.swf"
+ compilerArguments=""
+ />
+
+ <if>
+ <equals arg1="${project.android.certificate.password}" arg2=""/>
+ <then>
+ <input message="Certificate password:"
+ addproperty="var.project.app.certificate.password"/>
+ </then>
+ <else>
+ <var name="var.project.app.certificate.password" value="${project.android.certificate.password}" />
+ </else>
+ </if>
+
+ <var name="var.project.app.descriptor" value="${binrelease.dir}/${example.name}-apk.xml"/>
+ <copy file="${project.android.descriptor.template}" tofile="${var.project.app.descriptor}" overwrite="true">
+ <filterset>
+ <filter token="ID" value="${project.android.appID}" />
+ <filter token="FILENAME" value="${example.name}" />
+ <filter token="VERSION" value="${project.version}" />
+ <filter token="CONTENT" value="${example.name}.swf" />
+ </filterset>
+ </copy>
+
+ <java jar="${flexSDK.adt}" fork="true" failonerror="true">
+ <arg value="-package" />
+
+ <arg value="-target" />
+ <arg value="apk-captive-runtime" />
+
+ <arg value="-storetype" />
+ <arg value="pkcs12" />
+ <arg value="-keystore" />
+ <arg value="${project.android.certificate}"/>
+ <arg value="-storepass" />
+ <arg value="${var.project.app.certificate.password}" />
+
+ <arg value="${binrelease.dir}/${example.name}-captive.apk" />
+ <arg value="${var.project.app.descriptor}" />
+ <arg value="-C" />
+ <arg value="${binrelease.dir}" />
+ <arg value="${example.name}.swf" />
+ </java>
+ </target>
+
+
<target name="ide.startDebugger" description="Starts IDE Debugger">
<if>
<equals arg1="${user.ide}" arg2="FDT4"/>
@@ -225,26 +277,11 @@
<!-- Hidden targets and macro definitions-->
- <macrodef name="compile.example">
- <attribute name="exampleName" />
- <attribute name="compilerArguments" default="" />
- <attribute name="air" default="true" />
- <attribute name="openSWF" default="false" />
- <sequential>
- <compile.debug input="${project.examplesPackage.dir}/@{exampleName}.as"
- output="@{exampleName}.swf"
- compilerArguments="@{compilerArguments}"
- air="@{air}"
- openSWF="@{openSWF}"
- />
- </sequential>
- </macrodef>
-
<macrodef name="compile.debug">
<attribute name="input" />
<attribute name="output" />
- <attribute name="air" default="true" />
<attribute name="compilerArguments" default="" />
+ <attribute name="air" default="true" />
<attribute name="openSWF" default="false" />
<sequential>
<var name="var.compilerArguments" value="${project.baseCompilerArguments} ${project.debugCompilerArguments} @{compilerArguments}" />
@@ -256,7 +293,7 @@
</if>
<if>
- <equals arg1="${user.ide}" arg2="FDT4"/>
+ <equals arg1="${user.ide}" arg2="FDT4_foobar"/>
<then>
<fdt.launch.application projectname="${project.name}"
compilerarguments="${var.compilerArguments}"
@@ -299,4 +336,37 @@
</sequential>
</macrodef>
+ <macrodef name="compile.release">
+ <attribute name="input" />
+ <attribute name="output" />
+ <attribute name="compilerArguments" default="" />
+ <attribute name="air" default="true" />
+ <attribute name="openSWF" default="false" />
+ <sequential>
+ <var name="var.compilerArguments" value="${project.baseCompilerArguments} ${project.releaseCompilerArguments} @{compilerArguments}" />
+ <if>
+ <equals arg1="@{air}" arg2="true" />
+ <then>
+ <var name="var.compilerArguments" value="${var.compilerArguments} ${project.mobileCompilerArguments} +configname=airmobile" />
+ </then>
+ </if>
+
+ <java jar="${flexSDK.dir}/lib/mxmlc.jar" dir="${flexSDK.dir}/frameworks" fork="true" failonerror="true">
+ <arg value="${src.dir}/@{input}"/>
+ <arg value="-incremental=false"/>
+ <arg value="-headless-server=true"/>
+ <arg value="-debug=false"/>
+ <!--<arg value="+configname=flex"/>-->
+ <arg value="-source-path+=${src.dir}"/>
+ <arg value="-source-path+=${src_framework.dir}"/>
+ <arg value="-source-path+=${src_external.dir}"/>
+ <arg value="-library-path+=${flexSDK.dir}/frameworks/libs"/>
+ <arg value="-library-path+=${flexSDK.dir}/frameworks/libs/mx"/>
+ <arg value="-library-path+=${libs.dir}"/>
+ <arg value="-output=${binrelease.dir}/@{output}"/>
+ <arg line="${var.compilerArguments}"/>
+ </java>
+ </sequential>
+ </macrodef>
+
</project>
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<application xmlns="http://ns.adobe.com/air/application/3.0">
+<application xmlns="http://ns.adobe.com/air/application/3.2">
<!-- Adobe AIR Application Descriptor File Template.
@@ -101,7 +101,7 @@
<!-- The render mode for the app (either auto, cpu, or gpu). Optional. Mobile only. Default auto -->
- <!-- <renderMode></renderMode> -->
+ <renderMode>direct</renderMode>
<!-- Whether or not to pan when a soft keyboard is raised or lowered (either "pan" or "none"). Optional. Defaults "pan." -->
<!-- <softKeyboardBehavior></softKeyboardBehavior> -->
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<application xmlns="http://ns.adobe.com/air/application/2.6">
+<application xmlns="http://ns.adobe.com/air/application/3.2">
<!-- Adobe AIR Application Descriptor File Template.
@@ -88,20 +88,19 @@
<!-- <maxSize></maxSize> -->
<!-- The initial aspect ratio of the app when launched (either "portrait" or "landscape"). Optional. Mobile only. Default is the natural orientation of the device -->
-
<!-- <aspectRatio></aspectRatio> -->
<!-- Whether the app will begin auto-orienting on launch. Optional. Mobile only. Default false -->
-
<autoOrients>true</autoOrients>
<!-- Whether the app launches in full screen. Optional. Mobile only. Default false -->
-
<fullScreen>true</fullScreen>
<!-- The render mode for the app (either auto, cpu, or gpu). Optional. Mobile only. Default auto -->
+ <renderMode>direct</renderMode>
- <!-- <renderMode></renderMode> -->
+ <!-- Whether the default direct mode rendering context allocates storage for depth and stencil buffers. Optional. Default false. -->
+ <depthAndStencil>false</depthAndStencil>
<!-- Whether or not to pan when a soft keyboard is raised or lowered (either "pan" or "none"). Optional. Defaults "pan." -->
<!-- <softKeyboardBehavior></softKeyboardBehavior> -->
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
-<application xmlns="http://ns.adobe.com/air/application/2.6">
+<application xmlns="http://ns.adobe.com/air/application/3.2">
<!-- Adobe AIR Application Descriptor File Template.
@@ -88,20 +88,19 @@
<!-- <maxSize></maxSize> -->
<!-- The initial aspect ratio of the app when launched (either "portrait" or "landscape"). Optional. Mobile only. Default is the natural orientation of the device -->
-
<!-- <aspectRatio></aspectRatio> -->
<!-- Whether the app will begin auto-orienting on launch. Optional. Mobile only. Default false -->
-
<autoOrients>true</autoOrients>
<!-- Whether the app launches in full screen. Optional. Mobile only. Default false -->
-
<fullScreen>true</fullScreen>
<!-- The render mode for the app (either auto, cpu, or gpu). Optional. Mobile only. Default auto -->
+ <renderMode>direct</renderMode>
- <!-- <renderMode></renderMode> -->
+ <!-- Whether the default direct mode rendering context allocates storage for depth and stencil buffers. Optional. Default false. -->
+ <depthAndStencil>false</depthAndStencil>
<!-- Whether or not to pan when a soft keyboard is raised or lowered (either "pan" or "none"). Optional. Defaults "pan." -->
<!-- <softKeyboardBehavior></softKeyboardBehavior> -->
View
Binary file not shown.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -1,12 +1,15 @@
package org.gestouch.examples.model
{
- import org.gestouch.examples.views.DependentSwipingGesturesView;
+ import org.gestouch.examples.starling.ConflictGesturesExample;
+ import org.gestouch.examples.starling.TransformedViewportExample;
import org.gestouch.examples.views.ConflictGesturesView;
+ import org.gestouch.examples.views.DependentSwipingGesturesView;
import org.gestouch.examples.views.DependentTapGesturesView;
import org.gestouch.examples.views.LongPressGestureAdvancedView;
import org.gestouch.examples.views.LongPressGestureView;
import org.gestouch.examples.views.PanGestureView;
import org.gestouch.examples.views.RotateGestureView;
+ import org.gestouch.examples.views.StarlingExampleViewBase;
import org.gestouch.examples.views.SwipeGestureView;
import org.gestouch.examples.views.TapGestureUsageView;
import org.gestouch.examples.views.TapGestureView;
@@ -35,9 +38,9 @@ package org.gestouch.examples.model
,{label: "Conflicts Resolution Example", viewClass: ConflictGesturesView}
,{label: "Dependent Tap Gestures Example", viewClass: DependentTapGesturesView}
,{label: "Dependent Swiping Gestures Example", viewClass: DependentSwipingGesturesView}
+ ,{label: "Starling: Conflicts Example", viewClass: StarlingExampleViewBase, starlingMainClass: ConflictGesturesExample}
+ ,{label: "Starling: Transformed Viewport Example", viewClass: StarlingExampleViewBase, starlingMainClass: TransformedViewportExample}
]
);
-
- public var lastViewTitle:String;
}
}
Oops, something went wrong.

0 comments on commit 4d35bbc

Please sign in to comment.