forked from libgdx/libgdx
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'libgdx:master' into android
- Loading branch information
Showing
94 changed files
with
6,270 additions
and
70 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,13 +24,21 @@ jobs: | |
| key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-gradle- | ||
| - name: Apply formatter | ||
| - name: Generate MobiVM MetalANGLE backend | ||
| run: ./gradlew :backends:gdx-backend-robovm-metalangle:generate :backends:gdx-backend-robovm-metalangle:spotlessApply | ||
| - name: Commit generation changes | ||
| run: | | ||
| git config --local user.email "[email protected]" | ||
| git config --local user.name "GitHub Action" | ||
| git add backends/gdx-backend-robovm-metalangle/src | ||
| git commit -m "Generate MobiVM MetalANGLE backend" -a | ||
| continue-on-error: true | ||
| - name: Apply formater | ||
| run: ./gradlew spotlessApply | ||
| - name: Commit formatting changes | ||
| run: | | ||
| git config --local user.email "[email protected]" | ||
| git config --local user.name "GitHub Action" | ||
| git add . | ||
| git commit -m "Apply formatter" -a | ||
| continue-on-error: true | ||
| - name: Push formatting changes | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| ANGLE/MetalANGLE: | ||
| // Copyright 2018 The ANGLE Project Authors. | ||
| // All rights reserved. | ||
| // | ||
| // Redistribution and use in source and binary forms, with or without | ||
| // modification, are permitted provided that the following conditions | ||
| // are met: | ||
| // | ||
| // Redistributions of source code must retain the above copyright | ||
| // notice, this list of conditions and the following disclaimer. | ||
| // | ||
| // Redistributions in binary form must reproduce the above | ||
| // copyright notice, this list of conditions and the following | ||
| // disclaimer in the documentation and/or other materials provided | ||
| // with the distribution. | ||
| // | ||
| // Neither the name of TransGaming Inc., Google Inc., 3DLabs Inc. | ||
| // Ltd., nor the names of their contributors may be used to endorse | ||
| // or promote products derived from this software without specific | ||
| // prior written permission. | ||
| // | ||
| // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS | ||
| // FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE | ||
| // COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
| // INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, | ||
| // BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
| // LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||
| // CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
| // LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN | ||
| // ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| // POSSIBILITY OF SUCH DAMAGE. |
39 changes: 39 additions & 0 deletions
39
backends/gdx-backend-android/src/com/badlogic/gdx/backends/android/AndroidCursor.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
|
|
||
| package com.badlogic.gdx.backends.android; | ||
|
|
||
| import android.os.Build; | ||
| import android.view.PointerIcon; | ||
| import android.view.View; | ||
|
|
||
| import com.badlogic.gdx.graphics.Cursor; | ||
| import com.badlogic.gdx.utils.GdxRuntimeException; | ||
|
|
||
| public class AndroidCursor implements Cursor { | ||
|
|
||
| static void setSystemCursor (View view, SystemCursor systemCursor) { | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { | ||
| int type; | ||
| switch (systemCursor) { //@off | ||
| case Arrow: type = PointerIcon.TYPE_DEFAULT; break; | ||
| case Ibeam: type = PointerIcon.TYPE_TEXT; break; | ||
| case Crosshair: type = PointerIcon.TYPE_CROSSHAIR; break; | ||
| case Hand: type = PointerIcon.TYPE_HAND; break; | ||
| case HorizontalResize: type = PointerIcon.TYPE_HORIZONTAL_DOUBLE_ARROW; break; | ||
| case VerticalResize: type = PointerIcon.TYPE_VERTICAL_DOUBLE_ARROW; break; | ||
| case NWSEResize: type = PointerIcon.TYPE_TOP_LEFT_DIAGONAL_DOUBLE_ARROW; break; | ||
| case NESWResize: type = PointerIcon.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW; break; | ||
| case AllResize: type = PointerIcon.TYPE_ALL_SCROLL; break; | ||
| case NotAllowed: type = PointerIcon.TYPE_NO_DROP; break; // Closest match | ||
| case None: type = PointerIcon.TYPE_NULL; break; | ||
| default: throw new GdxRuntimeException("Unknown system cursor " + systemCursor); //@on | ||
| } | ||
| view.setPointerIcon(PointerIcon.getSystemIcon(view.getContext(), type)); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void dispose () { | ||
|
|
||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| /******************************************************************************* | ||
| * Copyright 2011 See AUTHORS file. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| ******************************************************************************/ | ||
| import org.gradle.internal.os.OperatingSystem | ||
|
|
||
| sourceSets { | ||
| generator { | ||
| java { | ||
| srcDir 'generator' | ||
| } | ||
| resources { | ||
| srcDir 'generator' | ||
| } | ||
| } | ||
| main { | ||
| java { | ||
| srcDir 'src' | ||
| } | ||
| resources { | ||
| srcDir 'res' | ||
| } | ||
| } | ||
| } | ||
| configurations { | ||
| generatorCompile.extendsFrom testCompile | ||
| generatorRuntime.extendsFrom testRuntime | ||
| } | ||
|
|
||
| configurations { generator } | ||
|
|
||
| dependencies { | ||
| api libraries.robovm | ||
| generatorImplementation 'com.github.javaparser:javaparser-core:3.24.2' | ||
| } | ||
|
|
||
| task generate(type: JavaExec) { | ||
| dependsOn configurations.generator | ||
|
|
||
| main = 'JavaCodeGenerator' | ||
| classpath = sourceSets.generator.runtimeClasspath | ||
|
|
||
| inputs.dir '../gdx-backend-robovm/src/' | ||
| outputs.dir 'src/' | ||
| } | ||
|
|
||
| task fetchMetalANGLE(type: Download) { | ||
| doFirst { | ||
| file("build/tmp").mkdirs(); | ||
| } | ||
| src 'https://github.com/kakashidinho/metalangle/releases/download/gles3-0.0.7/MetalANGLE.framework.ios.zip' | ||
| dest 'build/tmp/MetalANGLE.framework.ios.zip' | ||
| onlyIfModified true | ||
| useETag "all" | ||
| } | ||
|
|
||
| task fetchMetalANGLESimulator(type: Download) { | ||
| doFirst { | ||
| file("build/tmp").mkdirs(); | ||
| } | ||
| src 'https://github.com/kakashidinho/metalangle/releases/download/gles3-0.0.7/MetalANGLE.framework.ios.simulator.zip' | ||
| dest 'build/tmp/MetalANGLE.framework.ios.simulator.zip' | ||
| onlyIfModified true | ||
| useETag "all" | ||
| } | ||
|
|
||
| task verifyMetalANGLE(dependsOn: fetchMetalANGLE, type: Verify) { | ||
| src 'build/tmp/MetalANGLE.framework.ios.zip' | ||
| algorithm 'SHA-256' | ||
| checksum '66fcf9eed2ede9e5725bf64e5b3169e0f39d1a515fe425447354c41968fc7999' | ||
| } | ||
|
|
||
| task verifyMetalANGLESimulator(dependsOn: fetchMetalANGLESimulator, type: Verify) { | ||
| src 'build/tmp/MetalANGLE.framework.ios.simulator.zip' | ||
| algorithm 'SHA-256' | ||
| checksum 'e9aa526d2f19c57e1efbae4ec04d76701da4cf596bf8c6fb6ef6c507dbc2fdc4' | ||
| } | ||
|
|
||
| task extractMetalANGLE(dependsOn: verifyMetalANGLE, type: Copy) { | ||
| doFirst { | ||
| file("build/tmp/real").mkdirs(); | ||
| } | ||
| from zipTree('build/tmp/MetalANGLE.framework.ios.zip') | ||
| into 'build/tmp/real' | ||
| } | ||
|
|
||
| task extractMetalANGLESimulator(dependsOn: verifyMetalANGLESimulator, type: Copy) { | ||
| doFirst { | ||
| file("build/tmp/sim").mkdirs(); | ||
| } | ||
| from zipTree('build/tmp/MetalANGLE.framework.ios.simulator.zip') | ||
| into 'build/tmp/sim' | ||
| } | ||
|
|
||
| task buildMetalANGLE(dependsOn: [ | ||
| extractMetalANGLE, | ||
| extractMetalANGLESimulator | ||
| ], type: Exec) { | ||
| doFirst { | ||
| file("res/META-INF/robovm/ios/libs").mkdirs(); | ||
| } | ||
| commandLine 'xcodebuild', '-create-xcframework', '-framework', 'build/tmp/real/MetalANGLE.framework', '-framework', 'build/tmp/sim/MetalANGLE.framework', '-output', 'res/META-INF/robovm/ios/libs/MetalANGLE.xcframework' | ||
| standardOutput = new ByteArrayOutputStream() | ||
| ext.output = { | ||
| return standardOutput.toString() | ||
| } | ||
|
|
||
| inputs.dir 'build/tmp/real/MetalANGLE.framework' | ||
| inputs.dir 'build/tmp/sim/MetalANGLE.framework' | ||
| outputs.dir 'res/META-INF/robovm/ios/libs/MetalANGLE.xcframework' | ||
| } | ||
|
|
||
| task jnigenBuildIOS(dependsOn: buildMetalANGLE) { | ||
| } | ||
|
|
||
| task jnigenBuild() { | ||
| } | ||
|
|
||
| //Dummy task to make compatible with publish | ||
| task jnigen() { | ||
| } | ||
|
|
||
| if(OperatingSystem.current() == OperatingSystem.MAC_OS) { | ||
| jnigenBuild.dependsOn jnigenBuildIOS | ||
| } |
Oops, something went wrong.