From 84e67d4fd3fcd299e06c6728b3d4cf0732e947d5 Mon Sep 17 00:00:00 2001 From: anserran Date: Thu, 18 Sep 2014 21:23:10 +0200 Subject: [PATCH 01/16] Maven property for libGDX version --- .../resources/archetype-resources/pom.xml | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index 9fd5cd3..bd5ded7 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -9,6 +9,7 @@ \${JavaGameClassName} Parent + ${project.version} 4.1.1.4 3.8.1 2.6.0 @@ -20,20 +21,20 @@ com.badlogicgames.gdx gdx - ${project.version} + ${gdx.version} com.badlogicgames.gdx gdx-backend-android - ${project.version} + ${gdx.version} com.badlogicgames.gdx gdx-platform - ${project.version} + ${gdx.version} natives-armeabi provided @@ -43,20 +44,20 @@ com.badlogicgames.gdx gdx-backend-lwjgl - ${project.version} + ${gdx.version} com.badlogicgames.gdx gdx-platform - ${project.version} + ${gdx.version} natives-desktop com.badlogicgames.gdx gdx-platform - ${project.version} + ${gdx.version} natives-armeabi-v7a provided @@ -65,7 +66,7 @@ com.badlogicgames.gdx gdx - ${project.version} + ${gdx.version} sources provided @@ -73,7 +74,7 @@ com.badlogicgames.gdx gdx-backend-gwt - ${project.version} + ${gdx.version} sources provided @@ -81,7 +82,7 @@ com.badlogicgames.gdx gdx-backend-gwt - ${project.version} + ${gdx.version} @@ -89,7 +90,7 @@ com.badlogic.gdx gdx-backend-ios - ${project.version} + ${gdx.version} From 3f3bb8521444fa6a3ae66d5bb5b9334f186078d6 Mon Sep 17 00:00:00 2001 From: anserran Date: Thu, 18 Sep 2014 21:23:22 +0200 Subject: [PATCH 02/16] Updated libGDX version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 41aca0c..779a711 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.badlogic.gdx gdx-archetype - 1.2.0 + 1.3.1 maven-archetype Libgdx Project Archetype From 37b3aa4c74a260f750b360cfe21026bdc2306ad6 Mon Sep 17 00:00:00 2001 From: anserran Date: Thu, 18 Sep 2014 21:31:12 +0200 Subject: [PATCH 03/16] README updated --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b666cf3..97a59ad 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Creating a project using the archetype is accomplished like so: -DarchetypeRepository=$HOME/.m2/repository \ -DarchetypeGroupId=com.badlogic.gdx \ -DarchetypeArtifactId=gdx-archetype \ - -DarchetypeVersion=1.2.0 + -DarchetypeVersion=1.3.1 ``` This will then ask you a few questions: From 194efe6aff610039929cdea6c5981bbf5381f5c8 Mon Sep 17 00:00:00 2001 From: anserran Date: Wed, 27 Jan 2016 08:58:40 +0100 Subject: [PATCH 04/16] Update maven project xsd --- pom.xml | 2 +- src/main/resources/archetype-resources/android/pom.xml | 3 +-- src/main/resources/archetype-resources/core/pom.xml | 3 +-- src/main/resources/archetype-resources/desktop/pom.xml | 3 +-- src/main/resources/archetype-resources/html/pom.xml | 3 +-- src/main/resources/archetype-resources/ios/pom.xml | 4 +--- src/main/resources/archetype-resources/pom.xml | 3 +-- 7 files changed, 7 insertions(+), 14 deletions(-) diff --git a/pom.xml b/pom.xml index 779a711..b5357c9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,5 +1,5 @@ - + 4.0.0 com.badlogic.gdx gdx-archetype diff --git a/src/main/resources/archetype-resources/android/pom.xml b/src/main/resources/archetype-resources/android/pom.xml index 4e27db7..ab6662e 100644 --- a/src/main/resources/archetype-resources/android/pom.xml +++ b/src/main/resources/archetype-resources/android/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 ${groupId} diff --git a/src/main/resources/archetype-resources/core/pom.xml b/src/main/resources/archetype-resources/core/pom.xml index ed9d7d5..52b609c 100644 --- a/src/main/resources/archetype-resources/core/pom.xml +++ b/src/main/resources/archetype-resources/core/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 ${groupId} diff --git a/src/main/resources/archetype-resources/desktop/pom.xml b/src/main/resources/archetype-resources/desktop/pom.xml index dc7dfe6..99b74eb 100644 --- a/src/main/resources/archetype-resources/desktop/pom.xml +++ b/src/main/resources/archetype-resources/desktop/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 ${groupId} diff --git a/src/main/resources/archetype-resources/html/pom.xml b/src/main/resources/archetype-resources/html/pom.xml index 39eb2ce..aab88db 100644 --- a/src/main/resources/archetype-resources/html/pom.xml +++ b/src/main/resources/archetype-resources/html/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 ${groupId} diff --git a/src/main/resources/archetype-resources/ios/pom.xml b/src/main/resources/archetype-resources/ios/pom.xml index b1d63ae..1742bc6 100644 --- a/src/main/resources/archetype-resources/ios/pom.xml +++ b/src/main/resources/archetype-resources/ios/pom.xml @@ -1,7 +1,5 @@ - + 4.0.0 ${groupId} diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index bd5ded7..dec38c2 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -1,6 +1,5 @@ - + 4.0.0 \${groupId} \${artifactId} From 98c12d9e2e0190efa69858d138d1cc1633c8520e Mon Sep 17 00:00:00 2001 From: anserran Date: Sun, 21 Aug 2016 17:27:37 +0200 Subject: [PATCH 05/16] Simplify Game class --- README.md | 2 +- pom.xml | 2 +- .../META-INF/maven/archetype-metadata.xml | 303 +++++++++--------- .../assets/libgdx-logo.png | Bin .../main/java/core/__JavaGameClassName__.java | 31 +- 5 files changed, 157 insertions(+), 181 deletions(-) mode change 100755 => 100644 src/main/resources/archetype-resources/assets/libgdx-logo.png diff --git a/README.md b/README.md index 97a59ad..4d43cc4 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ Creating a project using the archetype is accomplished like so: -DarchetypeRepository=$HOME/.m2/repository \ -DarchetypeGroupId=com.badlogic.gdx \ -DarchetypeArtifactId=gdx-archetype \ - -DarchetypeVersion=1.3.1 + -DarchetypeVersion=1.3.2 ``` This will then ask you a few questions: diff --git a/pom.xml b/pom.xml index b5357c9..0033458 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.badlogic.gdx gdx-archetype - 1.3.1 + 1.3.2 maven-archetype Libgdx Project Archetype diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml index a8e2aef..f5e55b7 100644 --- a/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -1,154 +1,155 @@ - - - - - - - - assets - - **/* - - - - - desktop - - pom.xml - - - - desktop/src/main/java - - **/*.java - - - - - html - - pom.xml - - - - html/src/test/java - - - html/src/main/java - - **/*.java - **/*.xml - - - - html/src/main/webapp - - **/*.xml - **/*.html - - - - html/src/main/webapp - - favicon.ico - - - - - android - - pom.xml - - - - android/src/main/java - - **/*.java - - - - android/src/test/java - - **/*.java - - - - android/res/values - - **/*.xml - - - - android/res/drawable-ldpi - - **/*.png - - - - android/res/drawable-hdpi - - **/*.png - - - - android/res/drawable-mdpi - - **/*.png - - - - android - - AndroidManifest.xml - default.properties - - - - android - - proguard.cfg - - - - - ios - - pom.xml - - - - ios - - Info.plist - *.cs - *.csproj - *.sln - - - - ios - - **/*.png - - - + + + + + + + + assets + + **/* + + + + + desktop + + pom.xml + + + + desktop/src/main/java + + **/*.java + + + + + html + + pom.xml + + + + html/src/test/java + + + html/src/main/java + + **/*.java + **/*.xml + + + + html/src/main/webapp + + **/*.xml + **/*.html + + + + html/src/main/webapp + + favicon.ico + + + + + android + + pom.xml + + + + android/src/main/java + + **/*.java + + + + android/src/test/java + + **/*.java + + + + android/res/values + + **/*.xml + + + + android/res/drawable-ldpi + + **/*.png + + + + android/res/drawable-hdpi + + **/*.png + + + + android/res/drawable-mdpi + + **/*.png + + + + android + + AndroidManifest.xml + default.properties + + + + android + + proguard.cfg + + + + + ios + + pom.xml + + + + ios + + Info.plist + *.cs + *.csproj + *.sln + + + + ios + + **/*.png + + + - - - - - src/main/java - - **/*.java - - - - src/test/java - - - - + + + + + src/main/java + + **/*.java + + + + src/test/java + + + + diff --git a/src/main/resources/archetype-resources/assets/libgdx-logo.png b/src/main/resources/archetype-resources/assets/libgdx-logo.png old mode 100755 new mode 100644 diff --git a/src/main/resources/archetype-resources/core/src/main/java/core/__JavaGameClassName__.java b/src/main/resources/archetype-resources/core/src/main/java/core/__JavaGameClassName__.java index 71f228c..8bc4c54 100644 --- a/src/main/resources/archetype-resources/core/src/main/java/core/__JavaGameClassName__.java +++ b/src/main/resources/archetype-resources/core/src/main/java/core/__JavaGameClassName__.java @@ -6,43 +6,18 @@ import com.badlogic.gdx.graphics.GL30; import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.badlogic.gdx.ApplicationListener; +import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.Gdx; -public class ${JavaGameClassName} implements ApplicationListener { - Texture texture; - SpriteBatch batch; - float elapsed; +public class ${JavaGameClassName} extends ApplicationAdapter { @Override public void create () { - texture = new Texture(Gdx.files.internal("libgdx-logo.png")); - batch = new SpriteBatch(); - } - - @Override - public void resize (int width, int height) { + Gdx.gl.glClearColor(0, 0, 0, 0); } @Override public void render () { - elapsed += Gdx.graphics.getDeltaTime(); - Gdx.gl.glClearColor(0, 0, 0, 0); Gdx.gl.glClear(GL30.GL_COLOR_BUFFER_BIT); - batch.begin(); - batch.draw(texture, 100+100*(float)Math.cos(elapsed), 100+25*(float)Math.sin(elapsed)); - batch.end(); - } - - @Override - public void pause () { - } - - @Override - public void resume () { - } - - @Override - public void dispose () { } } From 27ea20afa453c2d8e3f7c8f7ca579c137a13728b Mon Sep 17 00:00:00 2001 From: Piotr Rojewski Date: Thu, 11 Jul 2019 10:50:16 +0200 Subject: [PATCH 06/16] Merge changes from bazomatic-master --- .gitignore | 108 ++++++- README.md | 6 + pom.xml | 10 +- .../META-INF/maven/archetype-metadata.xml | 306 +++++++++--------- .../resources/archetype-resources/.gitignore | 106 ++++++ .../archetype-resources/android/.gitignore | 106 ++++++ .../android/AndroidManifest.xml | 44 ++- .../archetype-resources/android/pom.xml | 61 +++- .../archetype-resources/core/.gitignore | 106 ++++++ .../archetype-resources/core/pom.xml | 4 + .../archetype-resources/desktop/.gitignore | 106 ++++++ .../archetype-resources/desktop/pom.xml | 9 +- .../archetype-resources/html/.gitignore | 108 +++++++ .../archetype-resources/html/pom.xml | 1 + .../java/html/__JavaGameClassName__Html.java | 5 + .../archetype-resources/ios/.gitignore | 106 ++++++ .../resources/archetype-resources/ios/pom.xml | 1 + .../resources/archetype-resources/pom.xml | 11 +- .../projects/basic/archetype.properties | 3 +- 19 files changed, 1013 insertions(+), 194 deletions(-) create mode 100644 src/main/resources/archetype-resources/.gitignore create mode 100644 src/main/resources/archetype-resources/android/.gitignore create mode 100644 src/main/resources/archetype-resources/core/.gitignore create mode 100644 src/main/resources/archetype-resources/desktop/.gitignore create mode 100644 src/main/resources/archetype-resources/html/.gitignore create mode 100644 src/main/resources/archetype-resources/ios/.gitignore diff --git a/.gitignore b/.gitignore index 736e100..12406b6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,106 @@ -/test-game/android/libs +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +## Java + +*.war +*.ear +hs_err_pid* + +## Robovm +robovm-build/ + +## GWT +war/ +html/war/gwt_bree/ +html/gwt-unitCache/ +.apt_generated/ +html/war/WEB-INF/deploy/ +html/war/WEB-INF/classes/ +.gwt/ +gwt-unitCache/ +www-test/ +.gwt-tmp/ + +## Android Studio and Intellij and Android in general +android/libs/armeabi/ +android/libs/armeabi-v7a/ +android/libs/arm64-v8a/ +android/libs/x86/ +android/libs/x86_64/ +android/gen/ +.idea/ +*.ipr +*.iws +*.iml +out/ +com_crashlytics_export_strings.xml + +## Eclipse .classpath .project -target/ +.metadata +**/bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties .settings/ -bin/ -*.iml -.idea +.loadpath +.externalToolBuilders/ +*.launch + +## NetBeans +**/nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +## Gradle + +.gradle +gradle-app.setting +build/ + +## Maven +target/ + +## OS Specific +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db +*.lnk diff --git a/README.md b/README.md index 4d43cc4..07f4368 100644 --- a/README.md +++ b/README.md @@ -145,3 +145,9 @@ Much of this archetype was adapted from [PlayN's archetype]. [libGDX]: http://libgdx.badlogicgames.com/ [Xamarin.iOS]: http://www.xamarin.com/ [PlayN's archetype]: https://github.com/threerings/playn/tree/master/archetype + + +### Bazomatic Fork Notes +v1.0.0.0 (June 18 2017) +
+ * Cloned existing branch diff --git a/pom.xml b/pom.xml index 0033458..633bc5b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,14 +7,16 @@ maven-archetype Libgdx Project Archetype - Archetype for libgdx projects. + Archetype for libgdx projects. Includes Ashley ECS + Support. Forked from + org.apache.maven.archetype archetype-packaging - 2.0 + 3.0.1 @@ -22,12 +24,12 @@ maven-archetype-plugin - 2.0 + 3.0.1 org.apache.maven.plugins maven-resources-plugin - 2.5 + 3.0.1 \ diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml index f5e55b7..b90ba81 100644 --- a/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -1,155 +1,157 @@ - - - - - - - - assets - - **/* - - - - - desktop - - pom.xml - - - - desktop/src/main/java - - **/*.java - - - - - html - - pom.xml - - - - html/src/test/java - - - html/src/main/java - - **/*.java - **/*.xml - - - - html/src/main/webapp - - **/*.xml - **/*.html - - - - html/src/main/webapp - - favicon.ico - - - - - android - - pom.xml - - - - android/src/main/java - - **/*.java - - - - android/src/test/java - - **/*.java - - - - android/res/values - - **/*.xml - - - - android/res/drawable-ldpi - - **/*.png - - - - android/res/drawable-hdpi - - **/*.png - - - - android/res/drawable-mdpi - - **/*.png - - - - android - - AndroidManifest.xml - default.properties - - - - android - - proguard.cfg - - - - - ios - - pom.xml - - - - ios - - Info.plist - *.cs - *.csproj - *.sln - - - - ios - - **/*.png - - - + + + + + + + + assets + + **/* + + + + + desktop + + pom.xml + + + + desktop/src/main/java + + **/*.java + + + + + html + + pom.xml + + + + html/src/test/java + + + html/src/main/java + + **/*.java + **/*.xml + + + + html/src/main/webapp + + **/*.xml + **/*.html + + + + html/src/main/webapp + + favicon.ico + + + + + android + + pom.xml + + + + android/src/main/java + + **/*.java + + + + android/src/test/java + + **/*.java + + + + android/res/values + + **/*.xml + + + + android/res/drawable-ldpi + + **/*.png + + + + android/res/drawable-hdpi + + **/*.png + + + + android/res/drawable-mdpi + + **/*.png + + + + android + + AndroidManifest.xml + default.properties + + + + android + + proguard.cfg + + + + + ios + + pom.xml + + + + ios + + Info.plist + *.cs + *.csproj + *.sln + + + + ios + + **/*.png + + + - - - - - src/main/java - - **/*.java - - - - src/test/java - - - - + + + + + src/main/java + + **/*.java + + + + src/test/java + + + + diff --git a/src/main/resources/archetype-resources/.gitignore b/src/main/resources/archetype-resources/.gitignore new file mode 100644 index 0000000..12406b6 --- /dev/null +++ b/src/main/resources/archetype-resources/.gitignore @@ -0,0 +1,106 @@ +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +## Java + +*.war +*.ear +hs_err_pid* + +## Robovm +robovm-build/ + +## GWT +war/ +html/war/gwt_bree/ +html/gwt-unitCache/ +.apt_generated/ +html/war/WEB-INF/deploy/ +html/war/WEB-INF/classes/ +.gwt/ +gwt-unitCache/ +www-test/ +.gwt-tmp/ + +## Android Studio and Intellij and Android in general +android/libs/armeabi/ +android/libs/armeabi-v7a/ +android/libs/arm64-v8a/ +android/libs/x86/ +android/libs/x86_64/ +android/gen/ +.idea/ +*.ipr +*.iws +*.iml +out/ +com_crashlytics_export_strings.xml + +## Eclipse +.classpath +.project +.metadata +**/bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.externalToolBuilders/ +*.launch + +## NetBeans +**/nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +## Gradle + +.gradle +gradle-app.setting +build/ + +## Maven +target/ + +## OS Specific +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db +*.lnk diff --git a/src/main/resources/archetype-resources/android/.gitignore b/src/main/resources/archetype-resources/android/.gitignore new file mode 100644 index 0000000..7783560 --- /dev/null +++ b/src/main/resources/archetype-resources/android/.gitignore @@ -0,0 +1,106 @@ +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +## Java + +*.war +*.ear +hs_err_pid* + +## Robovm +robovm-build/ + +## GWT +war/ +html/war/gwt_bree/ +html/gwt-unitCache/ +.apt_generated/ +html/war/WEB-INF/deploy/ +html/war/WEB-INF/classes/ +.gwt/ +gwt-unitCache/ +www-test/ +.gwt-tmp/ + +## Android Studio and Intellij and Android in general +android/libs/armeabi/ +android/libs/armeabi-v7a/ +android/libs/arm64-v8a/ +android/libs/x86/ +android/libs/x86_64/ +android/gen/ +.idea/ +*.ipr +*.iws +*.iml +out/ +com_crashlytics_export_strings.xml + +## Eclipse +.classpath +.project +.metadata +**/bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.externalToolBuilders/ +*.launch + +## NetBeans +**/nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +## Gradle + +.gradle +gradle-app.setting +build/ + +## Maven +target/ + +## OS Specific +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db +*.lnk \ No newline at end of file diff --git a/src/main/resources/archetype-resources/android/AndroidManifest.xml b/src/main/resources/archetype-resources/android/AndroidManifest.xml index 232d114..ec20c23 100644 --- a/src/main/resources/archetype-resources/android/AndroidManifest.xml +++ b/src/main/resources/archetype-resources/android/AndroidManifest.xml @@ -3,20 +3,30 @@ #set( $symbol_escape = '\' ) - - - - - - - - - - + package="${package}.android" + android:versionCode="1" + android:versionName="1.0" > + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/archetype-resources/android/pom.xml b/src/main/resources/archetype-resources/android/pom.xml index ab6662e..b5753cc 100644 --- a/src/main/resources/archetype-resources/android/pom.xml +++ b/src/main/resources/archetype-resources/android/pom.xml @@ -12,9 +12,11 @@ ${JavaGameClassName} Android + 24 game.keystore game - + ${keystore.password} @@ -57,6 +59,36 @@ ${project.artifactId} + + + com.simpligility.maven.plugins + android-maven-plugin + 4.3.0 + + ${project.basedir}/AndroidManifest.xml + ${project.basedir}/../assets + ${project.basedir}/res + + ${android.platform} + + true + + + -Xmx1024m + + + + true + + + deploy-on-install + install + + deploy + + + + com.googlecode.mavennatives @@ -86,7 +118,7 @@ ${project.basedir}/../assets ${project.basedir}/res - 19 + ${android.platform} true @@ -109,7 +141,8 @@ - + sign @@ -122,7 +155,9 @@ signing - sign + + sign + package true @@ -135,8 +170,10 @@ ${key.password} ${keystore.alias} - -sigalgMD5withRSA - -digestalgSHA1 + -sigalg + MD5withRSA + -digestalg + SHA1 @@ -147,14 +184,20 @@ android-maven-plugin true - false - false + + false + + + false + alignApk package - zipalign + + zipalign + diff --git a/src/main/resources/archetype-resources/core/.gitignore b/src/main/resources/archetype-resources/core/.gitignore new file mode 100644 index 0000000..7783560 --- /dev/null +++ b/src/main/resources/archetype-resources/core/.gitignore @@ -0,0 +1,106 @@ +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +## Java + +*.war +*.ear +hs_err_pid* + +## Robovm +robovm-build/ + +## GWT +war/ +html/war/gwt_bree/ +html/gwt-unitCache/ +.apt_generated/ +html/war/WEB-INF/deploy/ +html/war/WEB-INF/classes/ +.gwt/ +gwt-unitCache/ +www-test/ +.gwt-tmp/ + +## Android Studio and Intellij and Android in general +android/libs/armeabi/ +android/libs/armeabi-v7a/ +android/libs/arm64-v8a/ +android/libs/x86/ +android/libs/x86_64/ +android/gen/ +.idea/ +*.ipr +*.iws +*.iml +out/ +com_crashlytics_export_strings.xml + +## Eclipse +.classpath +.project +.metadata +**/bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.externalToolBuilders/ +*.launch + +## NetBeans +**/nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +## Gradle + +.gradle +gradle-app.setting +build/ + +## Maven +target/ + +## OS Specific +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db +*.lnk \ No newline at end of file diff --git a/src/main/resources/archetype-resources/core/pom.xml b/src/main/resources/archetype-resources/core/pom.xml index 52b609c..a0fc006 100644 --- a/src/main/resources/archetype-resources/core/pom.xml +++ b/src/main/resources/archetype-resources/core/pom.xml @@ -16,6 +16,10 @@ com.badlogicgames.gdx gdx + + com.badlogicgames.ashley + ashley + diff --git a/src/main/resources/archetype-resources/desktop/.gitignore b/src/main/resources/archetype-resources/desktop/.gitignore new file mode 100644 index 0000000..7783560 --- /dev/null +++ b/src/main/resources/archetype-resources/desktop/.gitignore @@ -0,0 +1,106 @@ +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +## Java + +*.war +*.ear +hs_err_pid* + +## Robovm +robovm-build/ + +## GWT +war/ +html/war/gwt_bree/ +html/gwt-unitCache/ +.apt_generated/ +html/war/WEB-INF/deploy/ +html/war/WEB-INF/classes/ +.gwt/ +gwt-unitCache/ +www-test/ +.gwt-tmp/ + +## Android Studio and Intellij and Android in general +android/libs/armeabi/ +android/libs/armeabi-v7a/ +android/libs/arm64-v8a/ +android/libs/x86/ +android/libs/x86_64/ +android/gen/ +.idea/ +*.ipr +*.iws +*.iml +out/ +com_crashlytics_export_strings.xml + +## Eclipse +.classpath +.project +.metadata +**/bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.externalToolBuilders/ +*.launch + +## NetBeans +**/nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +## Gradle + +.gradle +gradle-app.setting +build/ + +## Maven +target/ + +## OS Specific +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db +*.lnk \ No newline at end of file diff --git a/src/main/resources/archetype-resources/desktop/pom.xml b/src/main/resources/archetype-resources/desktop/pom.xml index 99b74eb..66e8cbd 100644 --- a/src/main/resources/archetype-resources/desktop/pom.xml +++ b/src/main/resources/archetype-resources/desktop/pom.xml @@ -16,6 +16,7 @@ + ${groupId} ${rootArtifactId}-core @@ -47,7 +48,7 @@ - + com.googlecode.mavennatives maven-nativedependencies-plugin @@ -56,7 +57,9 @@ unpacknatives pre-integration-test - copy + + copy + @@ -69,7 +72,7 @@ - + diff --git a/src/main/resources/archetype-resources/html/.gitignore b/src/main/resources/archetype-resources/html/.gitignore new file mode 100644 index 0000000..6cff872 --- /dev/null +++ b/src/main/resources/archetype-resources/html/.gitignore @@ -0,0 +1,108 @@ +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +## Java + +*.war +*.ear +hs_err_pid* + +## Robovm +robovm-build/ + +## GWT +war/ +html/war/gwt_bree/ +html/gwt-unitCache/ +.apt_generated/ +html/war/WEB-INF/deploy/ +html/war/WEB-INF/classes/ +.gwt/ +gwt-unitCache/ +www-test/ +.gwt-tmp/ + +## Android Studio and Intellij and Android in general +android/libs/armeabi/ +android/libs/armeabi-v7a/ +android/libs/arm64-v8a/ +android/libs/x86/ +android/libs/x86_64/ +android/gen/ +.idea/ +*.ipr +*.iws +*.iml +out/ +com_crashlytics_export_strings.xml + +## Eclipse +.classpath +.project +.metadata +**/bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.externalToolBuilders/ +*.launch + +## NetBeans +**/nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +## Gradle + +.gradle +gradle-app.setting +build/ + +## Maven <- This ignore must be ignored for the HTML5 version! +##target/ + +## OS Specific +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db +*.lnk +/classes/ +/modelone-html/ diff --git a/src/main/resources/archetype-resources/html/pom.xml b/src/main/resources/archetype-resources/html/pom.xml index aab88db..3d664a4 100644 --- a/src/main/resources/archetype-resources/html/pom.xml +++ b/src/main/resources/archetype-resources/html/pom.xml @@ -26,6 +26,7 @@ com.badlogicgames.gdx gdx-backend-gwt + ${libgdx.version} diff --git a/src/main/resources/archetype-resources/html/src/main/java/html/__JavaGameClassName__Html.java b/src/main/resources/archetype-resources/html/src/main/java/html/__JavaGameClassName__Html.java index c666fa7..bfeb5e0 100644 --- a/src/main/resources/archetype-resources/html/src/main/java/html/__JavaGameClassName__Html.java +++ b/src/main/resources/archetype-resources/html/src/main/java/html/__JavaGameClassName__Html.java @@ -19,4 +19,9 @@ public ApplicationListener getApplicationListener () { public GwtApplicationConfiguration getConfig () { return new GwtApplicationConfiguration(480, 320); } + + @Override + public ApplicationListener createApplicationListener () { + return getApplicationListener(); + } } diff --git a/src/main/resources/archetype-resources/ios/.gitignore b/src/main/resources/archetype-resources/ios/.gitignore new file mode 100644 index 0000000..7783560 --- /dev/null +++ b/src/main/resources/archetype-resources/ios/.gitignore @@ -0,0 +1,106 @@ +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +## Java + +*.war +*.ear +hs_err_pid* + +## Robovm +robovm-build/ + +## GWT +war/ +html/war/gwt_bree/ +html/gwt-unitCache/ +.apt_generated/ +html/war/WEB-INF/deploy/ +html/war/WEB-INF/classes/ +.gwt/ +gwt-unitCache/ +www-test/ +.gwt-tmp/ + +## Android Studio and Intellij and Android in general +android/libs/armeabi/ +android/libs/armeabi-v7a/ +android/libs/arm64-v8a/ +android/libs/x86/ +android/libs/x86_64/ +android/gen/ +.idea/ +*.ipr +*.iws +*.iml +out/ +com_crashlytics_export_strings.xml + +## Eclipse +.classpath +.project +.metadata +**/bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath +.externalToolBuilders/ +*.launch + +## NetBeans +**/nbproject/private/ +build/ +nbbuild/ +dist/ +nbdist/ +nbactions.xml +nb-configuration.xml + +## Gradle + +.gradle +gradle-app.setting +build/ + +## Maven +target/ + +## OS Specific +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +ehthumbs.db +Thumbs.db +*.lnk \ No newline at end of file diff --git a/src/main/resources/archetype-resources/ios/pom.xml b/src/main/resources/archetype-resources/ios/pom.xml index 1742bc6..f1327d8 100644 --- a/src/main/resources/archetype-resources/ios/pom.xml +++ b/src/main/resources/archetype-resources/ios/pom.xml @@ -22,6 +22,7 @@ com.badlogic.gdx gdx-backend-ios + ${libgdx.version} diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index dec38c2..9292b7c 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -11,12 +11,20 @@ ${project.version} 4.1.1.4 3.8.1 + 1.7.0 2.6.0 2.6.0 - + + + com.badlogicgames.ashley + ashley + ${ashley.version} + + + com.badlogicgames.gdx gdx @@ -38,7 +46,6 @@ provided - com.badlogicgames.gdx diff --git a/src/test/resources/projects/basic/archetype.properties b/src/test/resources/projects/basic/archetype.properties index c220294..738b117 100644 --- a/src/test/resources/projects/basic/archetype.properties +++ b/src/test/resources/projects/basic/archetype.properties @@ -1,5 +1,4 @@ -#Thu Aug 25 14:12:57 PDT 2011 -version=0.1-SNAPSHOT +version=1.0.0.0 groupId=archetype.it artifactId=basic JavaGameClassName=Test From 120a50524befe59ed92f58caf41b491e42ddd4f1 Mon Sep 17 00:00:00 2001 From: Piotr Rojewski Date: Thu, 11 Jul 2019 11:36:18 +0200 Subject: [PATCH 07/16] Update versions --- pom.xml | 2 +- src/main/resources/archetype-resources/pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 633bc5b..c59324e 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.badlogic.gdx gdx-archetype - 1.3.2 + 1.9.9 maven-archetype Libgdx Project Archetype diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index 9292b7c..c985661 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -118,10 +118,10 @@ org.apache.maven.plugins maven-compiler-plugin - 2.5.1 + 3.1 - 1.6 - 1.6 + 1.8 + 1.8 From d37bf9fe078d9b4db51a47f66ff2ca56f3f63602 Mon Sep 17 00:00:00 2001 From: Piotr Rojewski Date: Thu, 11 Jul 2019 12:35:27 +0200 Subject: [PATCH 08/16] Fix module problem and versioning problem. --- .../META-INF/maven/archetype-metadata.xml | 18 ++++++++++++++++++ .../resources/archetype-resources/core/pom.xml | 2 +- .../resources/archetype-resources/html/pom.xml | 2 +- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml index b90ba81..bd5a60b 100644 --- a/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -136,8 +136,25 @@ **/*.png + + + core + + pom.xml + + + + core/src/main/java + + **/*.java + + + + core/src/test/java + + diff --git a/src/main/resources/archetype-resources/core/pom.xml b/src/main/resources/archetype-resources/core/pom.xml index a0fc006..029a2ff 100644 --- a/src/main/resources/archetype-resources/core/pom.xml +++ b/src/main/resources/archetype-resources/core/pom.xml @@ -7,7 +7,7 @@ ${version} - ${artifactId} + ${artifactId}-core jar ${JavaGameClassName} Core diff --git a/src/main/resources/archetype-resources/html/pom.xml b/src/main/resources/archetype-resources/html/pom.xml index 3d664a4..3ea4459 100644 --- a/src/main/resources/archetype-resources/html/pom.xml +++ b/src/main/resources/archetype-resources/html/pom.xml @@ -26,7 +26,7 @@ com.badlogicgames.gdx gdx-backend-gwt - ${libgdx.version} + ${gdx.version} From 3792b7cd4927c4eb15aff110e41e758e8da14539 Mon Sep 17 00:00:00 2001 From: Piotr Rojewski Date: Thu, 11 Jul 2019 13:24:00 +0200 Subject: [PATCH 09/16] Update version of GWT to version compatible with plugin. --- src/main/resources/archetype-resources/html/pom.xml | 2 ++ src/main/resources/archetype-resources/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/resources/archetype-resources/html/pom.xml b/src/main/resources/archetype-resources/html/pom.xml index 3ea4459..f877f4a 100644 --- a/src/main/resources/archetype-resources/html/pom.xml +++ b/src/main/resources/archetype-resources/html/pom.xml @@ -40,6 +40,7 @@ com.badlogicgames.gdx gdx + ${gdx.version} sources provided @@ -47,6 +48,7 @@ com.badlogicgames.gdx gdx-backend-gwt + ${gdx.version} sources provided diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index c985661..9fc4236 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -12,8 +12,8 @@ 4.1.1.4 3.8.1 1.7.0 - 2.6.0 - 2.6.0 + 2.8.0 + 2.8.0 From 296f2b8df6e8c7d4adf87e1ca6be31a59515b062 Mon Sep 17 00:00:00 2001 From: Piotr Rojewski Date: Thu, 11 Jul 2019 14:26:35 +0200 Subject: [PATCH 10/16] Update code and HTML to be closer to newest version. --- .../main/java/core/__JavaGameClassName__.java | 31 ++++- .../main/java/__JavaGameClassName__.gwt.xml | 1 + .../html/src/main/webapp/WEB-INF/web.xml | 15 +-- .../html/src/main/webapp/index.html | 26 ++++ .../html/src/main/webapp/refresh.png | Bin 0 -> 2971 bytes .../src/main/webapp/soundmanager2-jsmin.js | 113 ++++++++++++++++++ .../src/main/webapp/soundmanager2-setup.js | 1 + .../html/src/main/webapp/styles.css | 43 +++++++ 8 files changed, 213 insertions(+), 17 deletions(-) create mode 100644 src/main/resources/archetype-resources/html/src/main/webapp/refresh.png create mode 100644 src/main/resources/archetype-resources/html/src/main/webapp/soundmanager2-jsmin.js create mode 100644 src/main/resources/archetype-resources/html/src/main/webapp/soundmanager2-setup.js create mode 100644 src/main/resources/archetype-resources/html/src/main/webapp/styles.css diff --git a/src/main/resources/archetype-resources/core/src/main/java/core/__JavaGameClassName__.java b/src/main/resources/archetype-resources/core/src/main/java/core/__JavaGameClassName__.java index 8bc4c54..f00ee93 100644 --- a/src/main/resources/archetype-resources/core/src/main/java/core/__JavaGameClassName__.java +++ b/src/main/resources/archetype-resources/core/src/main/java/core/__JavaGameClassName__.java @@ -3,21 +3,42 @@ #set( $symbol_escape = '\' ) package ${package}.core; -import com.badlogic.gdx.graphics.GL30; -import com.badlogic.gdx.graphics.Texture; -import com.badlogic.gdx.graphics.g2d.SpriteBatch; import com.badlogic.gdx.ApplicationAdapter; import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.Input; +import com.badlogic.gdx.graphics.GL20; +import com.badlogic.gdx.graphics.Texture; +import com.badlogic.gdx.graphics.g2d.BitmapFont; +import com.badlogic.gdx.graphics.g2d.SpriteBatch; public class ${JavaGameClassName} extends ApplicationAdapter { + private SpriteBatch batch; + private Texture img; + private BitmapFont font; @Override public void create () { - Gdx.gl.glClearColor(0, 0, 0, 0); + batch = new SpriteBatch(); + img = new Texture("badlogic.jpg"); + font = new BitmapFont(); + + Gdx.gl.glClearColor(1, 0, 0, 1); } @Override public void render () { - Gdx.gl.glClear(GL30.GL_COLOR_BUFFER_BIT); + Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); + batch.begin(); + batch.draw(img, 100, 100); + font.draw(batch, "Welcome to libGDX!", 100, 400); + batch.end(); } + + @Override + public void dispose () { + batch.dispose(); + img.dispose(); + font.dispose(); + } + } diff --git a/src/main/resources/archetype-resources/html/src/main/java/__JavaGameClassName__.gwt.xml b/src/main/resources/archetype-resources/html/src/main/java/__JavaGameClassName__.gwt.xml index aea6a35..ac54fb0 100644 --- a/src/main/resources/archetype-resources/html/src/main/java/__JavaGameClassName__.gwt.xml +++ b/src/main/resources/archetype-resources/html/src/main/java/__JavaGameClassName__.gwt.xml @@ -12,4 +12,5 @@ + diff --git a/src/main/resources/archetype-resources/html/src/main/webapp/WEB-INF/web.xml b/src/main/resources/archetype-resources/html/src/main/webapp/WEB-INF/web.xml index e979d35..4301df2 100644 --- a/src/main/resources/archetype-resources/html/src/main/webapp/WEB-INF/web.xml +++ b/src/main/resources/archetype-resources/html/src/main/webapp/WEB-INF/web.xml @@ -1,12 +1,3 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) - - - - - + + + \ No newline at end of file diff --git a/src/main/resources/archetype-resources/html/src/main/webapp/index.html b/src/main/resources/archetype-resources/html/src/main/webapp/index.html index c76339a..7992bab 100644 --- a/src/main/resources/archetype-resources/html/src/main/webapp/index.html +++ b/src/main/resources/archetype-resources/html/src/main/webapp/index.html @@ -5,8 +5,34 @@ ${JavaGameClassName} + + + + + + ↻ +
+ diff --git a/src/main/resources/archetype-resources/html/src/main/webapp/refresh.png b/src/main/resources/archetype-resources/html/src/main/webapp/refresh.png new file mode 100644 index 0000000000000000000000000000000000000000..24a48f1cc98e37dcb6fce0939031097d755b32fa GIT binary patch literal 2971 zcmV;M3uN?(P)P000>X1^@s6#OZ}&00009a7bBm00Fw{ z00Fw{0m1P(^#A}0PiaF#P*7-ZbZ>KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0002SNklC?JFqz$umxLj^tFD>OwPH$CP5$aOn_ao1VC~T z%yU8%V@~kn?MQ)u>$46p_rRcnP<$4uKqdsD!LXcPq8zA%rzmK5bCgP+lK^f^se}n2 z&1%*jMxz~QgYDX7Ht|e%(eDgy=L&vN$?`WKr=+~B2j{0IS-Na=wl9cHMU%{bbIl%* z%^a37HX@Q1FlR?6$?F$80V5hA5`L!Jpse3$<+kkR`J2dWFTt_8J9tT60|11hJfrg0 R0y+Qy002ovPDHLkV1j|Zhj9P^ literal 0 HcmV?d00001 diff --git a/src/main/resources/archetype-resources/html/src/main/webapp/soundmanager2-jsmin.js b/src/main/resources/archetype-resources/html/src/main/webapp/soundmanager2-jsmin.js new file mode 100644 index 0000000..2077360 --- /dev/null +++ b/src/main/resources/archetype-resources/html/src/main/webapp/soundmanager2-jsmin.js @@ -0,0 +1,113 @@ +/** @license + + + SoundManager 2: JavaScript Sound for the Web + ---------------------------------------------- + http://schillmania.com/projects/soundmanager2/ + + Copyright (c) 2007, Scott Schiller. All rights reserved. + Code provided under the BSD License: + http://schillmania.com/projects/soundmanager2/license.txt + + V2.97a.20150601 +*/ +(function(h,g){function K(sb,K){function ha(b){return c.preferFlash&&H&&!c.ignoreFlash&&c.flash[b]!==g&&c.flash[b]}function r(b){return function(d){var e=this._s;e&&e._a?d=b.call(this,d):(e&&e.id?c._wD(e.id+": Ignoring "+d.type):c._wD("HTML5::Ignoring "+d.type),d=null);return d}}this.setupOptions={url:sb||null,flashVersion:8,debugMode:!0,debugFlash:!1,useConsole:!0,consoleOnly:!0,waitForWindowLoad:!1,bgColor:"#ffffff",useHighPerformance:!1,flashPollingInterval:null,html5PollingInterval:null,flashLoadTimeout:1E3, +wmode:null,allowScriptAccess:"always",useFlashBlock:!1,useHTML5Audio:!0,forceUseGlobalHTML5Audio:!1,ignoreMobileRestrictions:!1,html5Test:/^(probably|maybe)$/i,preferFlash:!1,noSWFCache:!1,idPrefix:"sound"};this.defaultOptions={autoLoad:!1,autoPlay:!1,from:null,loops:1,onid3:null,onload:null,whileloading:null,onplay:null,onpause:null,onresume:null,whileplaying:null,onposition:null,onstop:null,onfailure:null,onfinish:null,multiShot:!0,multiShotEvents:!1,position:null,pan:0,stream:!0,to:null,type:null, +usePolicyFile:!1,volume:100};this.flash9Options={isMovieStar:null,usePeakData:!1,useWaveformData:!1,useEQData:!1,onbufferchange:null,ondataerror:null};this.movieStarOptions={bufferTime:3,serverURL:null,onconnect:null,duration:null};this.audioFormats={mp3:{type:['audio/mpeg; codecs="mp3"',"audio/mpeg","audio/mp3","audio/MPA","audio/mpa-robust"],required:!0},mp4:{related:["aac","m4a","m4b"],type:['audio/mp4; codecs="mp4a.40.2"',"audio/aac","audio/x-m4a","audio/MP4A-LATM","audio/mpeg4-generic"],required:!1}, +ogg:{type:["audio/ogg; codecs=vorbis"],required:!1},opus:{type:["audio/ogg; codecs=opus","audio/opus"],required:!1},wav:{type:['audio/wav; codecs="1"',"audio/wav","audio/wave","audio/x-wav"],required:!1}};this.movieID="sm2-container";this.id=K||"sm2movie";this.debugID="soundmanager-debug";this.debugURLParam=/([#?&])debug=1/i;this.versionNumber="V2.97a.20150601";this.altURL=this.movieURL=this.version=null;this.enabled=this.swfLoaded=!1;this.oMC=null;this.sounds={};this.soundIDs=[];this.didFlashBlock= +this.muted=!1;this.filePattern=null;this.filePatterns={flash8:/\.mp3(\?.*)?$/i,flash9:/\.mp3(\?.*)?$/i};this.features={buffering:!1,peakData:!1,waveformData:!1,eqData:!1,movieStar:!1};this.sandbox={type:null,types:{remote:"remote (domain-based) rules",localWithFile:"local with file access (no internet access)",localWithNetwork:"local with network (internet access only, no local access)",localTrusted:"local, trusted (local+internet access)"},description:null,noRemote:null,noLocal:null};this.html5= +{usingFlash:null};this.flash={};this.ignoreFlash=this.html5Only=!1;var W,c=this,Ya=null,l=null,F,v=navigator.userAgent,ia=h.location.href.toString(),m=document,ya,Za,za,n,I=[],Aa=!0,D,X=!1,Y=!1,q=!1,y=!1,ja=!1,p,tb=0,Z,A,Ba,R,Ca,P,S,T,$a,Da,Ea,ka,z,la,Q,Fa,aa,ma,na,U,ab,Ga,bb=["log","info","warn","error"],cb,Ha,db,ba=null,Ia=null,t,Ja,V,eb,oa,pa,L,w,ca=!1,Ka=!1,fb,gb,hb,qa=0,da=null,ra,M=[],ea,u=null,ib,sa,fa,N,ta,La,jb,x,kb=Array.prototype.slice,C=!1,Ma,H,Na,lb,J,mb,Oa,ua,nb=0,Pa,Qa=v.match(/(ipad|iphone|ipod)/i), +Ra=v.match(/android/i),O=v.match(/msie/i),ub=v.match(/webkit/i),va=v.match(/safari/i)&&!v.match(/chrome/i),Sa=v.match(/opera/i),wa=v.match(/(mobile|pre\/|xoom)/i)||Qa||Ra,Ta=!ia.match(/usehtml5audio/i)&&!ia.match(/sm2\-ignorebadua/i)&&va&&!v.match(/silk/i)&&v.match(/OS X 10_6_([3-7])/i),Ua=h.console!==g&&console.log!==g,Va=m.hasFocus!==g?m.hasFocus():null,xa=va&&(m.hasFocus===g||!m.hasFocus()),ob=!xa,pb=/(mp3|mp4|mpa|m4a|m4b)/i,ga=m.location?m.location.protocol.match(/http/i):null,vb=ga?"":"http://", +qb=/^\s*audio\/(?:x-)?(?:mpeg4|aac|flv|mov|mp4||m4v|m4a|m4b|mp4v|3gp|3g2)\s*(?:$|;)/i,rb="mpeg4 aac flv mov mp4 m4v f4v m4a m4b mp4v 3gp 3g2".split(" "),wb=new RegExp("\\.("+rb.join("|")+")(\\?.*)?$","i");this.mimePattern=/^\s*audio\/(?:x-)?(?:mp(?:eg|3))\s*(?:$|;)/i;this.useAltURL=!ga;var Wa;try{Wa=Audio!==g&&(Sa&&opera!==g&&10>opera.version()?new Audio(null):new Audio).canPlayType!==g}catch(xb){Wa=!1}this.hasHTML5=Wa;this.setup=function(b){var d=!c.url;b!==g&&q&&u&&c.ok()&&(b.flashVersion!==g|| +b.url!==g||b.html5Test!==g)&&L(t("setupLate"));Ba(b);if(!C)if(wa){if(!c.setupOptions.ignoreMobileRestrictions||c.setupOptions.forceUseGlobalHTML5Audio)M.push(z.globalHTML5),C=!0}else c.setupOptions.forceUseGlobalHTML5Audio&&(M.push(z.globalHTML5),C=!0);if(!Pa&&wa)if(c.setupOptions.ignoreMobileRestrictions)M.push(z.ignoreMobile);else if(c.setupOptions.useHTML5Audio&&!c.setupOptions.preferFlash||c._wD(z.mobileUA),c.setupOptions.useHTML5Audio=!0,c.setupOptions.preferFlash=!1,Qa)c.ignoreFlash=!0;else if(Ra&& +!v.match(/android\s2\.3/i)||!Ra)c._wD(z.globalHTML5),C=!0;b&&(d&&aa&&b.url!==g&&c.beginDelayedInit(),aa||b.url===g||"complete"!==m.readyState||setTimeout(Q,1));Pa=!0;return c};this.supported=this.ok=function(){return u?q&&!y:c.useHTML5Audio&&c.hasHTML5};this.getMovie=function(c){return F(c)||m[c]||h[c]};this.createSound=function(b,d){function e(){f=oa(f);c.sounds[f.id]=new W(f);c.soundIDs.push(f.id);return c.sounds[f.id]}var a,f;a=null;a="soundManager.createSound(): "+t(q?"notOK":"notReady");if(!q|| +!c.ok())return L(a),!1;d!==g&&(b={id:b,url:d});f=A(b);f.url=ra(f.url);f.id===g&&(f.id=c.setupOptions.idPrefix+nb++);f.id.toString().charAt(0).match(/^[0-9]$/)&&c._wD("soundManager.createSound(): "+t("badID",f.id),2);c._wD("soundManager.createSound(): "+f.id+(f.url?" ("+f.url+")":""),1);if(w(f.id,!0))return c._wD("soundManager.createSound(): "+f.id+" exists",1),c.sounds[f.id];if(sa(f))a=e(),c.html5Only||c._wD(f.id+": Using HTML5"),a._setup_html5(f);else{if(c.html5Only)return c._wD(f.id+": No HTML5 support for this sound, and no Flash. Exiting."), +e();if(c.html5.usingFlash&&f.url&&f.url.match(/data\:/i))return c._wD(f.id+": data: URIs not supported via Flash. Exiting."),e();8a.instanceCount?(m(),e=a._setup_html5(),a.setPosition(a._iO.position),e.play()):(c._wD(a.id+": Cloning Audio() for instance #"+ +a.instanceCount+"..."),k=new Audio(a._iO.url),G=function(){x.remove(k,"ended",G);a._onfinish(a);ta(k);k=null},h=function(){x.remove(k,"canplay",h);try{k.currentTime=a._iO.position/1E3}catch(c){L(a.id+": multiShot play() failed to apply position of "+a._iO.position/1E3)}k.play()},x.add(k,"ended",G),a._iO.volume!==g&&(k.volume=Math.max(0,Math.min(1,a._iO.volume/100))),a.muted&&(k.muted=!0),a._iO.position?x.add(k,"canplay",h):k.play()):(B=l._start(a.id,a._iO.loops||1,9===n?a.position:a.position/1E3, +a._iO.multiShot||!1),9!==n||B||(c._wD(e+"No sound hardware, or 32-sound ceiling hit",2),a._iO.onplayerror&&a._iO.onplayerror.apply(a)))}return a};this.stop=function(b){var d=a._iO;1===a.playState&&(c._wD(a.id+": stop()"),a._onbufferchange(0),a._resetOnPosition(0),a.paused=!1,a.isHTML5||(a.playState=0),Xa(),d.to&&a.clearOnPosition(d.to),a.isHTML5?a._a&&(b=a.position,a.setPosition(0),a.position=b,a._a.pause(),a.playState=0,a._onTimer(),G()):(l._stop(a.id,b),d.serverURL&&a.unload()),a.instanceCount= +0,a._iO={},d.onstop&&d.onstop.apply(a));return a};this.setAutoPlay=function(b){c._wD(a.id+": Autoplay turned "+(b?"on":"off"));a._iO.autoPlay=b;a.isHTML5||(l._setAutoPlay(a.id,b),b&&!a.instanceCount&&1===a.readyState&&(a.instanceCount++,c._wD(a.id+": Incremented instance count to "+a.instanceCount)))};this.getAutoPlay=function(){return a._iO.autoPlay};this.setPosition=function(b){b===g&&(b=0);var d=a.isHTML5?Math.max(b,0):Math.min(a.duration||a._iO.duration,Math.max(b,0));a.position=d;b=a.position/ +1E3;a._resetOnPosition(a.position);a._iO.position=d;if(!a.isHTML5)b=9===n?a.position:b,a.readyState&&2!==a.readyState&&l._setPosition(a.id,b,a.paused||!a.playState,a._iO.multiShot);else if(a._a){if(a._html5_canplay){if(a._a.currentTime!==b){c._wD(a.id+": setPosition("+b+")");try{a._a.currentTime=b,(0===a.playState||a.paused)&&a._a.pause()}catch(e){c._wD(a.id+": setPosition("+b+") failed: "+e.message,2)}}}else if(b)return c._wD(a.id+": setPosition("+b+"): Cannot seek yet, sound not ready",2),a;a.paused&& +a._onTimer(!0)}return a};this.pause=function(b){if(a.paused||0===a.playState&&1!==a.readyState)return a;c._wD(a.id+": pause()");a.paused=!0;a.isHTML5?(a._setup_html5().pause(),G()):(b||b===g)&&l._pause(a.id,a._iO.multiShot);a._iO.onpause&&a._iO.onpause.apply(a);return a};this.resume=function(){var b=a._iO;if(!a.paused)return a;c._wD(a.id+": resume()");a.paused=!1;a.playState=1;a.isHTML5?(a._setup_html5().play(),m()):(b.isMovieStar&&!b.serverURL&&a.setPosition(a.position),l._pause(a.id,b.multiShot)); +!r&&b.onplay?(b.onplay.apply(a),r=!0):b.onresume&&b.onresume.apply(a);return a};this.togglePause=function(){c._wD(a.id+": togglePause()");if(0===a.playState)return a.play({position:9!==n||a.isHTML5?a.position/1E3:a.position}),a;a.paused?a.resume():a.pause();return a};this.setPan=function(c,b){c===g&&(c=0);b===g&&(b=!1);a.isHTML5||l._setPan(a.id,c);a._iO.pan=c;b||(a.pan=c,a.options.pan=c);return a};this.setVolume=function(b,d){b===g&&(b=100);d===g&&(d=!1);a.isHTML5?a._a&&(c.muted&&!a.muted&&(a.muted= +!0,a._a.muted=!0),a._a.volume=Math.max(0,Math.min(1,b/100))):l._setVolume(a.id,c.muted&&!a.muted||a.muted?0:b);a._iO.volume=b;d||(a.volume=b,a.options.volume=b);return a};this.mute=function(){a.muted=!0;a.isHTML5?a._a&&(a._a.muted=!0):l._setVolume(a.id,0);return a};this.unmute=function(){a.muted=!1;var b=a._iO.volume!==g;a.isHTML5?a._a&&(a._a.muted=!1):l._setVolume(a.id,b?a._iO.volume:a.options.volume);return a};this.toggleMute=function(){return a.muted?a.unmute():a.mute()};this.onposition=this.onPosition= +function(b,c,d){E.push({position:parseInt(b,10),method:c,scope:d!==g?d:a,fired:!1});return a};this.clearOnPosition=function(a,b){var c;a=parseInt(a,10);if(isNaN(a))return!1;for(c=0;c=b)return!1;for(--b;0<=b;b--)c=E[b],!c.fired&&a.position>=c.position&&(c.fired=!0,v++,c.method.apply(c.scope,[c.position]));return!0};this._resetOnPosition= +function(a){var b,c;b=E.length;if(!b)return!1;for(--b;0<=b;b--)c=E[b],c.fired&&a<=c.position&&(c.fired=!1,v--);return!0};y=function(){var b=a._iO,d=b.from,e=b.to,f,g;g=function(){c._wD(a.id+': "To" time of '+e+" reached.");a.clearOnPosition(e,g);a.stop()};f=function(){c._wD(a.id+': Playing "from" '+d);if(null!==e&&!isNaN(e))a.onPosition(e,g)};null===d||isNaN(d)||(b.position=d,b.multiShot=!1,f());return b};q=function(){var b,c=a._iO.onposition;if(c)for(b in c)if(c.hasOwnProperty(b))a.onPosition(parseInt(b, +10),c[b])};Xa=function(){var b,c=a._iO.onposition;if(c)for(b in c)c.hasOwnProperty(b)&&a.clearOnPosition(parseInt(b,10))};m=function(){a.isHTML5&&fb(a)};G=function(){a.isHTML5&&gb(a)};f=function(b){b||(E=[],v=0);r=!1;a._hasTimer=null;a._a=null;a._html5_canplay=!1;a.bytesLoaded=null;a.bytesTotal=null;a.duration=a._iO&&a._iO.duration?a._iO.duration:null;a.durationEstimate=null;a.buffered=[];a.eqData=[];a.eqData.left=[];a.eqData.right=[];a.failures=0;a.isBuffering=!1;a.instanceOptions={};a.instanceCount= +0;a.loaded=!1;a.metadata={};a.readyState=0;a.muted=!1;a.paused=!1;a.peakData={left:0,right:0};a.waveformData={left:[],right:[]};a.playState=0;a.position=null;a.id3={}};f();this._onTimer=function(b){var c,f=!1,g={};if(a._hasTimer||b)return a._a&&(b||(0opera.version()?new Audio(null):new Audio,c=a._a,c._called_load=!1,C&&(Ya=c);a.isHTML5=!0;a._a=c;c._s=a;h();a._apply_loop(c,b.loops);b.autoLoad||b.autoPlay?a.load():(c.autobuffer=!1,c.preload="auto");return c};h=function(){if(a._a._added_events)return!1;var b;a._a._added_events=!0;for(b in J)J.hasOwnProperty(b)&&a._a&&a._a.addEventListener(b,J[b],!1);return!0};k=function(){var b; +c._wD(a.id+": Removing event listeners");a._a._added_events=!1;for(b in J)J.hasOwnProperty(b)&&a._a&&a._a.removeEventListener(b,J[b],!1)};this._onload=function(b){var d=!!b||!a.isHTML5&&8===n&&a.duration;b=a.id+": ";c._wD(b+(d?"onload()":"Failed to load / invalid sound?"+(a.duration?" -":" Zero-length duration reported.")+" ("+a.url+")"),d?1:2);d||a.isHTML5||(!0===c.sandbox.noRemote&&c._wD(b+t("noNet"),1),!0===c.sandbox.noLocal&&c._wD(b+t("noLocal"),1));a.loaded=d;a.readyState=d?3:2;a._onbufferchange(0); +a._iO.onload&&ua(a,function(){a._iO.onload.apply(a,[d])});return!0};this._onbufferchange=function(b){if(0===a.playState||b&&a.isBuffering||!b&&!a.isBuffering)return!1;a.isBuffering=1===b;a._iO.onbufferchange&&(c._wD(a.id+": Buffer state change: "+b),a._iO.onbufferchange.apply(a,[b]));return!0};this._onsuspend=function(){a._iO.onsuspend&&(c._wD(a.id+": Playback suspended"),a._iO.onsuspend.apply(a));return!0};this._onfailure=function(b,d,e){a.failures++;c._wD(a.id+": Failure ("+a.failures+"): "+b); +if(a._iO.onfailure&&1===a.failures)a._iO.onfailure(b,d,e);else c._wD(a.id+": Ignoring failure")};this._onwarning=function(b,c,d){if(a._iO.onwarning)a._iO.onwarning(b,c,d)};this._onfinish=function(){var b=a._iO.onfinish;a._onbufferchange(0);a._resetOnPosition(0);a.instanceCount&&(a.instanceCount--,a.instanceCount||(Xa(),a.playState=0,a.paused=!1,a.instanceCount=0,a.instanceOptions={},a._iO={},G(),a.isHTML5&&(a.position=0)),a.instanceCount&&!a._iO.multiShotEvents||!b||(c._wD(a.id+": onfinish()"),ua(a, +function(){b.apply(a)})))};this._whileloading=function(b,c,d,e){var f=a._iO;a.bytesLoaded=b;a.bytesTotal=c;a.duration=Math.floor(d);a.bufferLength=e;a.durationEstimate=a.isHTML5||f.isMovieStar?a.duration:f.duration?a.duration>f.duration?a.duration:f.duration:parseInt(a.bytesTotal/a.bytesLoaded*a.duration,10);a.isHTML5||(a.buffered=[{start:0,end:a.duration}]);(3!==a.readyState||a.isHTML5)&&f.whileloading&&f.whileloading.apply(a)};this._whileplaying=function(b,c,d,e,f){var k=a._iO;if(isNaN(b)||null=== +b)return!1;a.position=Math.max(0,b);a._processOnPosition();!a.isHTML5&&8opera.version()?new Audio(null):new Audio:null,e,a,f={},h,k;h=c.audioFormats;for(e in h)if(h.hasOwnProperty(e)&&(a="audio/"+e,f[e]=b(h[e].type),f[a]=f[e],e.match(pb)?(c.flash[e]=!0,c.flash[a]=!0):(c.flash[e]=!1,c.flash[a]=!1),h[e]&&h[e].related))for(k=h[e].related.length-1;0<=k;k--)f["audio/"+h[e].related[k]]= +f[e],c.html5[h[e].related[k]]=f[e],c.flash[h[e].related[k]]=f[e];f.canPlayType=d?b:null;c.html5=A(c.html5,f);c.html5.usingFlash=ib();u=c.html5.usingFlash;return!0};z={notReady:"Unavailable - wait until onready() has fired.",notOK:"Audio support is not available.",domError:"soundManagerexception caught while appending SWF to DOM.",spcWmode:"Removing wmode, preventing known SWF loading issue(s)",swf404:"soundManager: Verify that %s is a valid path.",tryDebug:"Try soundManager.debugFlash = true for more security details (output goes to SWF.)", +checkSWF:"See SWF output for more debug info.",localFail:"soundManager: Non-HTTP page ("+m.location.protocol+" URL?) Review Flash player security settings for this special case:\nhttp://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html\nMay need to add/allow path, eg. c:/sm2/ or /users/me/sm2/",waitFocus:"soundManager: Special case: Waiting for SWF to load with window focus...",waitForever:"soundManager: Waiting indefinitely for Flash (will recover if unblocked)...", +waitSWF:"soundManager: Waiting for 100% SWF load...",needFunction:"soundManager: Function object expected for %s",badID:'Sound ID "%s" should be a string, starting with a non-numeric character',currentObj:"soundManager: _debug(): Current sound objects",waitOnload:"soundManager: Waiting for window.onload()",docLoaded:"soundManager: Document already loaded",onload:"soundManager: initComplete(): calling soundManager.onload()",onloadOK:"soundManager.onload() complete",didInit:"soundManager: init(): Already called?", +secNote:"Flash security note: Network/internet URLs will not load due to security restrictions. Access can be configured via Flash Player Global Security Settings Page: http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager04.html",badRemove:"soundManager: Failed to remove Flash node.",shutdown:"soundManager.disable(): Shutting down",queue:"soundManager: Queueing %s handler",smError:"SMSound.load(): Exception: JS-Flash communication failed, or JS error.",fbTimeout:"No flash response, applying .swf_timedout CSS...", +fbLoaded:"Flash loaded",fbHandler:"soundManager: flashBlockHandler()",manURL:"SMSound.load(): Using manually-assigned URL",onURL:"soundManager.load(): current URL already assigned.",badFV:'soundManager.flashVersion must be 8 or 9. "%s" is invalid. Reverting to %s.',as2loop:"Note: Setting stream:false so looping can work (flash 8 limitation)",noNSLoop:"Note: Looping not implemented for MovieStar formats",needfl9:"Note: Switching to flash 9, required for MP4 formats.",mfTimeout:"Setting flashLoadTimeout = 0 (infinite) for off-screen, mobile flash case", +needFlash:"soundManager: Fatal error: Flash is needed to play some required formats, but is not available.",gotFocus:"soundManager: Got window focus.",policy:"Enabling usePolicyFile for data access",setup:"soundManager.setup(): allowed parameters: %s",setupError:'soundManager.setup(): "%s" cannot be assigned with this method.',setupUndef:'soundManager.setup(): Could not find option "%s"',setupLate:"soundManager.setup(): url, flashVersion and html5Test property changes will not take effect until reboot().", +noURL:"soundManager: Flash URL required. Call soundManager.setup({url:...}) to get started.",sm2Loaded:"SoundManager 2: Ready. "+String.fromCharCode(10003),reset:"soundManager.reset(): Removing event callbacks",mobileUA:"Mobile UA detected, preferring HTML5 by default.",globalHTML5:"Using singleton HTML5 Audio() pattern for this device.",ignoreMobile:"Ignoring mobile restrictions for this device."};t=function(){var b,c,e,a;b=kb.call(arguments);c=b.shift();if((a=z&&z[c]?z[c]:"")&&b&&b.length)for(c= +0,e=b.length;cn&&(c._wD(t("needfl9")),c.flashVersion=n=9);c.version=c.versionNumber+(c.html5Only?" (HTML5-only mode)":9===n?" (AS3/Flash 9)":" (AS2/Flash 8)");8'}if(X&&Y)return!1;if(c.html5Only)return Ea(),e(),c.oMC=F(c.movieID),za(),Y=X=!0,!1;var f=d||c.url,h=c.altURL||f,k=ma(),l=V(), +n=null,n=m.getElementsByTagName("html")[0],p,r,q,n=n&&n.dir&&n.dir.match(/rtl/i);b=b===g?c.id:b;Ea();c.url=db(ga?f:h);d=c.url;c.wmode=!c.wmode&&c.useHighPerformance?"transparent":c.wmode;null!==c.wmode&&(v.match(/msie 8/i)||!O&&!c.useHighPerformance)&&navigator.platform.match(/win32|win64/i)&&(M.push(z.spcWmode),c.wmode=null);k={name:b,id:b,src:d,quality:"high",allowScriptAccess:c.allowScriptAccess,bgcolor:c.bgColor,pluginspage:vb+"www.macromedia.com/go/getflashplayer",title:"JS/Flash audio component (SoundManager 2)", +type:"application/x-shockwave-flash",wmode:c.wmode,hasPriority:"true"};c.debugFlash&&(k.FlashVars="debug=1");c.wmode||delete k.wmode;if(O)f=m.createElement("div"),r=['',a("movie",d),a("AllowScriptAccess",c.allowScriptAccess),a("quality",k.quality),c.wmode?a("wmode",c.wmode):"",a("bgcolor", +c.bgColor),a("hasPriority","true"),c.debugFlash?a("FlashVars",k.FlashVars):"",""].join("");else for(p in f=m.createElement("embed"),k)k.hasOwnProperty(p)&&f.setAttribute(p,k[p]);Ga();l=V();if(k=ma())if(c.oMC=F(c.movieID)||m.createElement("div"),c.oMC.id)q=c.oMC.className,c.oMC.className=(q?q+" ":"movieContainer")+(l?" "+l:""),c.oMC.appendChild(f),O&&(p=c.oMC.appendChild(m.createElement("div")),p.className="sm2-object-box",p.innerHTML=r),Y=!0;else{c.oMC.id=c.movieID;c.oMC.className="movieContainer "+ +l;p=l=null;c.useFlashBlock||(c.useHighPerformance?l={position:"fixed",width:"8px",height:"8px",bottom:"0px",left:"0px",overflow:"hidden"}:(l={position:"absolute",width:"6px",height:"6px",top:"-9999px",left:"-9999px"},n&&(l.left=Math.abs(parseInt(l.left,10))+"px")));ub&&(c.oMC.style.zIndex=1E4);if(!c.debugFlash)for(q in l)l.hasOwnProperty(q)&&(c.oMC.style[q]=l[q]);try{O||c.oMC.appendChild(f),k.appendChild(c.oMC),O&&(p=c.oMC.appendChild(m.createElement("div")),p.className="sm2-object-box",p.innerHTML= +r),Y=!0}catch(u){throw Error(t("domError")+" \n"+u.toString());}}X=!0;e();return!0};la=function(){if(c.html5Only)return na(),!1;if(l)return!1;if(!c.url)return p("noURL"),!1;l=c.getMovie(c.id);l||(ba?(O?c.oMC.innerHTML=Ia:c.oMC.appendChild(ba),ba=null,X=!0):na(c.id,c.url),l=c.getMovie(c.id));"function"===typeof c.oninitmovie&&setTimeout(c.oninitmovie,1);Oa();return!0};T=function(){setTimeout($a,1E3)};Da=function(){h.setTimeout(function(){L("soundManager: useFlashBlock is false, 100% HTML5 mode is possible. Rebooting with preferFlash: false..."); +c.setup({preferFlash:!1}).reboot();c.didFlashBlock=!0;c.beginDelayedInit()},1)};$a=function(){var b,d=!1;if(!c.url||ca)return!1;ca=!0;x.remove(h,"load",T);if(H&&xa&&!Va)return p("waitFocus"),!1;q||(b=c.getMoviePercent(),0b&&(d=!0));setTimeout(function(){b=c.getMoviePercent();if(d)return ca=!1,c._wD(t("waitSWF")),h.setTimeout(T,1),!1;q||(c._wD("soundManager: No Flash response within expected time. Likely causes: "+(0===b?"SWF load failed, ":"")+"Flash blocked or JS-Flash security error."+(c.debugFlash? +" "+t("checkSWF"):""),2),!ga&&b&&(p("localFail",2),c.debugFlash||p("tryDebug",2)),0===b&&c._wD(t("swf404",c.url),1),D("flashtojs",!1,": Timed out"+(ga?" (Check flash security or flash blockers)":" (No plugin/missing SWF?)")));!q&&ob&&(null===b?c.useFlashBlock||0===c.flashLoadTimeout?(c.useFlashBlock&&Ja(),p("waitForever")):!c.useFlashBlock&&ea?Da():(p("waitForever"),P({type:"ontimeout",ignoreInit:!0,error:{type:"INIT_FLASHBLOCK"}})):0===c.flashLoadTimeout?p("waitForever"):!c.useFlashBlock&&ea?Da(): +Ha(!0))},c.flashLoadTimeout)};ka=function(){if(Va||!xa)return x.remove(h,"focus",ka),!0;Va=ob=!0;p("gotFocus");ca=!1;T();x.remove(h,"focus",ka);return!0};Oa=function(){M.length&&(c._wD("SoundManager 2: "+M.join(" "),1),M=[])};mb=function(){Oa();var b,d=[];if(c.useHTML5Audio&&c.hasHTML5){for(b in c.audioFormats)c.audioFormats.hasOwnProperty(b)&&d.push(b+" = "+c.html5[b]+(!c.html5[b]&&u&&c.flash[b]?" (using flash)":c.preferFlash&&c.flash[b]&&u?" (preferring flash)":c.html5[b]?"":" ("+(c.audioFormats[b].required? +"required, ":"")+"and no flash support)"));c._wD("SoundManager 2 HTML5 support: "+d.join(", "),1)}};Z=function(b){if(q)return!1;if(c.html5Only)return p("sm2Loaded",1),q=!0,S(),D("onload",!0),!0;var d=!0,e;c.useFlashBlock&&c.flashLoadTimeout&&!c.getMoviePercent()||(q=!0);e={type:!H&&u?"NO_FLASH":"INIT_TIMEOUT"};c._wD("SoundManager 2 "+(y?"failed to load":"loaded")+" ("+(y?"Flash security/load error":"OK")+") "+String.fromCharCode(y?10006:10003),y?2:1);y||b?(c.useFlashBlock&&c.oMC&&(c.oMC.className= +V()+" "+(null===c.getMoviePercent()?"swf_timedout":"swf_error")),P({type:"ontimeout",error:e,ignoreInit:!0}),D("onload",!1),U(e),d=!1):D("onload",!0);y||(c.waitForWindowLoad&&!ja?(p("waitOnload"),x.add(h,"load",S)):(c.waitForWindowLoad&&ja&&p("docLoaded"),S()));return d};Za=function(){var b,d=c.setupOptions;for(b in d)d.hasOwnProperty(b)&&(c[b]===g?c[b]=d[b]:c[b]!==d[b]&&(c.setupOptions[b]=c[b]))};za=function(){if(q)return p("didInit"),!1;if(c.html5Only)return q||(x.remove(h,"load",c.beginDelayedInit), +c.enabled=!0,Z()),!0;la();try{l._externalInterfaceTest(!1),ab(!0,c.flashPollingInterval||(c.useHighPerformance?10:50)),c.debugMode||l._disableDebug(),c.enabled=!0,D("jstoflash",!0),c.html5Only||x.add(h,"unload",ya)}catch(b){return c._wD("js/flash exception: "+b.toString()),D("jstoflash",!1),U({type:"JS_TO_FLASH_EXCEPTION",fatal:!0}),Ha(!0),Z(),!1}Z();x.remove(h,"load",c.beginDelayedInit);return!0};Q=function(){if(aa)return!1;aa=!0;Za();Ga();!H&&c.hasHTML5&&(c._wD("SoundManager 2: No Flash detected"+ +(c.useHTML5Audio?". Trying HTML5-only mode.":", enabling HTML5."),1),c.setup({useHTML5Audio:!0,preferFlash:!1}));jb();!H&&u&&(M.push(z.needFlash),c.setup({flashLoadTimeout:1}));m.removeEventListener&&m.removeEventListener("DOMContentLoaded",Q,!1);la();return!0};La=function(){"complete"===m.readyState&&(Q(),m.detachEvent("onreadystatechange",La));return!0};Fa=function(){ja=!0;Q();x.remove(h,"load",Fa)};Na();x.add(h,"focus",ka);x.add(h,"load",T);x.add(h,"load",Fa);m.addEventListener?m.addEventListener("DOMContentLoaded", +Q,!1):m.attachEvent?m.attachEvent("onreadystatechange",La):(D("onload",!1),U({type:"NO_DOM2_EVENTS",fatal:!0}))}if(!h||!h.document)throw Error("SoundManager requires a browser with window and document objects.");var W=null;h.SM2_DEFER!==g&&SM2_DEFER||(W=new K);"object"===typeof module&&module&&"object"===typeof module.exports?(module.exports.SoundManager=K,module.exports.soundManager=W):"function"===typeof define&&define.amd&&define(function(){return{constructor:K,getInstance:function(g){!h.soundManager&& +g instanceof Function&&(g=g(K),g instanceof K&&(h.soundManager=g));return h.soundManager}}});h.SoundManager=K;h.soundManager=W})(window); \ No newline at end of file diff --git a/src/main/resources/archetype-resources/html/src/main/webapp/soundmanager2-setup.js b/src/main/resources/archetype-resources/html/src/main/webapp/soundmanager2-setup.js new file mode 100644 index 0000000..4d0ac66 --- /dev/null +++ b/src/main/resources/archetype-resources/html/src/main/webapp/soundmanager2-setup.js @@ -0,0 +1 @@ +window.SM2_DEFER = true; \ No newline at end of file diff --git a/src/main/resources/archetype-resources/html/src/main/webapp/styles.css b/src/main/resources/archetype-resources/html/src/main/webapp/styles.css new file mode 100644 index 0000000..0abbdaa --- /dev/null +++ b/src/main/resources/archetype-resources/html/src/main/webapp/styles.css @@ -0,0 +1,43 @@ +canvas { + cursor: default; + outline: none; +} + +body { + background-color: #222222; +} + +.superdev { + color: rgb(37,37,37); + text-shadow: 0px 1px 1px rgba(250,250,250,0.1); + font-size: 50pt; + display: block; + position: relative; + text-decoration: none; + background-color: rgb(83,87,93); + box-shadow: 0px 3px 0px 0px rgb(34,34,34), + 0px 7px 10px 0px rgb(17,17,17), + inset 0px 1px 1px 0px rgba(250, 250, 250, .2), + inset 0px -12px 35px 0px rgba(0, 0, 0, .5); + width: 70px; + height: 70px; + border: 0; + border-radius: 35px; + text-align: center; + line-height: 68px; +} + +.superdev:active { + box-shadow: 0px 0px 0px 0px rgb(34,34,34), + 0px 3px 7px 0px rgb(17,17,17), + inset 0px 1px 1px 0px rgba(250, 250, 250, .2), + inset 0px -10px 35px 5px rgba(0, 0, 0, .5); + background-color: rgb(83,87,93); + top: 3px; + color: #fff; + text-shadow: 0px 0px 3px rgb(250,250,250); +} + +.superdev:hover { + background-color: rgb(100,100,100); +} From afd605816a7f40cc131ba69d13c7c10148d6cb71 Mon Sep 17 00:00:00 2001 From: Piotr Rojewski Date: Thu, 11 Jul 2019 15:13:34 +0200 Subject: [PATCH 11/16] Update HTML elements. --- src/main/resources/META-INF/maven/archetype-metadata.xml | 4 ++++ .../html/src/main/java/__JavaGameClassName__.gwt.xml | 4 ++++ .../archetype-resources/html/src/main/webapp/index.html | 6 +++--- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml index bd5a60b..01fd8c8 100644 --- a/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -50,6 +50,10 @@ **/*.xml **/*.html + **/*.js + **/*.png + **/*.css + **/*.ico diff --git a/src/main/resources/archetype-resources/html/src/main/java/__JavaGameClassName__.gwt.xml b/src/main/resources/archetype-resources/html/src/main/java/__JavaGameClassName__.gwt.xml index ac54fb0..b2950e0 100644 --- a/src/main/resources/archetype-resources/html/src/main/java/__JavaGameClassName__.gwt.xml +++ b/src/main/resources/archetype-resources/html/src/main/java/__JavaGameClassName__.gwt.xml @@ -12,5 +12,9 @@ + + + + diff --git a/src/main/resources/archetype-resources/html/src/main/webapp/index.html b/src/main/resources/archetype-resources/html/src/main/webapp/index.html index 7992bab..ce15b5f 100644 --- a/src/main/resources/archetype-resources/html/src/main/webapp/index.html +++ b/src/main/resources/archetype-resources/html/src/main/webapp/index.html @@ -8,11 +8,11 @@ - - + + - ↻ + ↻
From f43f2cd92f2c2bd804216385a5916bc813b1f7e1 Mon Sep 17 00:00:00 2001 From: Piotr Rojewski Date: Thu, 11 Jul 2019 15:28:58 +0200 Subject: [PATCH 12/16] Update HTML elements. --- src/main/resources/META-INF/maven/archetype-metadata.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml index 01fd8c8..3f05c71 100644 --- a/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -50,16 +50,15 @@ **/*.xml **/*.html - **/*.js - **/*.png - **/*.css - **/*.ico html/src/main/webapp favicon.ico + **/*.js + **/*.png + **/*.css From b9d66c0b98f72c8ae16054720c5849ade80909cf Mon Sep 17 00:00:00 2001 From: Piotr Rojewski Date: Thu, 11 Jul 2019 15:34:34 +0200 Subject: [PATCH 13/16] Fix missing character --- .../archetype-resources/html/src/main/webapp/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/archetype-resources/html/src/main/webapp/index.html b/src/main/resources/archetype-resources/html/src/main/webapp/index.html index ce15b5f..85e1b72 100644 --- a/src/main/resources/archetype-resources/html/src/main/webapp/index.html +++ b/src/main/resources/archetype-resources/html/src/main/webapp/index.html @@ -12,7 +12,7 @@ - ↻ + ↻
From be9bb588174acd313e241f59755ecac04f181db8 Mon Sep 17 00:00:00 2001 From: rojekabc Date: Thu, 11 Jul 2019 15:42:39 +0200 Subject: [PATCH 14/16] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 07f4368..59ab3ab 100644 --- a/README.md +++ b/README.md @@ -26,14 +26,14 @@ Creating a project using the archetype is accomplished like so: -DarchetypeRepository=$HOME/.m2/repository \ -DarchetypeGroupId=com.badlogic.gdx \ -DarchetypeArtifactId=gdx-archetype \ - -DarchetypeVersion=1.3.2 + -DarchetypeVersion=1.9.9 ``` -This will then ask you a few questions: +This will then ask you a few questions about your project's configuration: * Define value for property 'groupId': : **com.mytest** * Define value for property 'artifactId': : **mygame** - * Define value for property 'version': 1.2.0: : **** + * Define value for property 'version': 1.0-SNAPSHOT: : **** * Define value for property 'package': com.mytest: : **** * Define value for property 'JavaGameClassName': : **MyGame** From 4035363ab6a9212705a0fc8a72106f935f5ddb7f Mon Sep 17 00:00:00 2001 From: rojekabc Date: Thu, 11 Jul 2019 15:43:10 +0200 Subject: [PATCH 15/16] Update README.md --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index 59ab3ab..53aa2bf 100644 --- a/README.md +++ b/README.md @@ -145,9 +145,3 @@ Much of this archetype was adapted from [PlayN's archetype]. [libGDX]: http://libgdx.badlogicgames.com/ [Xamarin.iOS]: http://www.xamarin.com/ [PlayN's archetype]: https://github.com/threerings/playn/tree/master/archetype - - -### Bazomatic Fork Notes -v1.0.0.0 (June 18 2017) -
- * Cloned existing branch From 403a3c4392ace728e2647d961bd2003815b56f68 Mon Sep 17 00:00:00 2001 From: Piotr Rojewski Date: Thu, 11 Jul 2019 15:49:37 +0200 Subject: [PATCH 16/16] Clean up. - remove marked as comment section - remove ashley dependency --- pom.xml | 4 +--- .../META-INF/maven/archetype-metadata.xml | 18 ------------------ .../resources/archetype-resources/core/pom.xml | 4 ---- src/main/resources/archetype-resources/pom.xml | 8 -------- 4 files changed, 1 insertion(+), 33 deletions(-) diff --git a/pom.xml b/pom.xml index c59324e..b86c501 100644 --- a/pom.xml +++ b/pom.xml @@ -7,9 +7,7 @@ maven-archetype Libgdx Project Archetype - Archetype for libgdx projects. Includes Ashley ECS - Support. Forked from - + Archetype for libgdx projects. diff --git a/src/main/resources/META-INF/maven/archetype-metadata.xml b/src/main/resources/META-INF/maven/archetype-metadata.xml index 3f05c71..073425d 100644 --- a/src/main/resources/META-INF/maven/archetype-metadata.xml +++ b/src/main/resources/META-INF/maven/archetype-metadata.xml @@ -157,22 +157,4 @@ - diff --git a/src/main/resources/archetype-resources/core/pom.xml b/src/main/resources/archetype-resources/core/pom.xml index 029a2ff..260a5a1 100644 --- a/src/main/resources/archetype-resources/core/pom.xml +++ b/src/main/resources/archetype-resources/core/pom.xml @@ -16,10 +16,6 @@ com.badlogicgames.gdx gdx - - com.badlogicgames.ashley - ashley - diff --git a/src/main/resources/archetype-resources/pom.xml b/src/main/resources/archetype-resources/pom.xml index 9fc4236..98753e2 100644 --- a/src/main/resources/archetype-resources/pom.xml +++ b/src/main/resources/archetype-resources/pom.xml @@ -11,19 +11,11 @@ ${project.version} 4.1.1.4 3.8.1 - 1.7.0 2.8.0 2.8.0 - - - com.badlogicgames.ashley - ashley - ${ashley.version} - - com.badlogicgames.gdx