Compare commits
No commits in common. "c1929734107968f5b44b6b8d162af64a89466e60" and "1a7c3074c62b798c0c21c622f050d3281485fa3f" have entirely different histories.
c192973410
...
1a7c3074c6
|
|
@ -1,38 +1 @@
|
||||||
# Rust/Cargo
|
/target
|
||||||
debug/
|
|
||||||
target/
|
|
||||||
Cargo.lock
|
|
||||||
**/*.rs.bk
|
|
||||||
*.pdb
|
|
||||||
jniLibs/
|
|
||||||
|
|
||||||
# Gradle files
|
|
||||||
.gradle/
|
|
||||||
build/
|
|
||||||
|
|
||||||
# Local configuration file (sdk path, etc)
|
|
||||||
local.properties
|
|
||||||
|
|
||||||
# Android Studio generated files and folders
|
|
||||||
captures/
|
|
||||||
.externalNativeBuild/
|
|
||||||
.cxx/
|
|
||||||
*.apk
|
|
||||||
output.json
|
|
||||||
|
|
||||||
# IntelliJ
|
|
||||||
*.iml
|
|
||||||
.idea/
|
|
||||||
misc.xml
|
|
||||||
deploymentTargetDropDown.xml
|
|
||||||
render.experimental.xml
|
|
||||||
|
|
||||||
# Keystore files
|
|
||||||
*.jks
|
|
||||||
*.keystore
|
|
||||||
|
|
||||||
# Google Services (e.g. APIs or Firebase)
|
|
||||||
google-services.json
|
|
||||||
|
|
||||||
# Android Profiling
|
|
||||||
*.hprof
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -5,15 +5,6 @@ name = "avoid-rs"
|
||||||
version = "0.2.1"
|
version = "0.2.1"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[lib]
|
|
||||||
name = "avoid"
|
|
||||||
path = "src/lib.rs"
|
|
||||||
crate-type = [
|
|
||||||
"staticlib",
|
|
||||||
"cdylib", # needed for Android
|
|
||||||
"rlib", # rlib needed for running locally
|
|
||||||
]
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
bevy = { version = "0.15.2", features = ["wav"] }
|
bevy = { version = "0.15.2", features = ["wav"] }
|
||||||
fastrand = "*"
|
fastrand = "*"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +0,0 @@
|
||||||
# This is part of a hack to convince gradle to insert libc++_shared.so
|
|
||||||
cmake_minimum_required(VERSION 3.4.1)
|
|
||||||
project(cppshared_dummy)
|
|
||||||
set (SRC_DIR ./src/main/cpp)
|
|
||||||
add_library (dummy SHARED ${SRC_DIR}/dummy.cpp)
|
|
||||||
|
|
@ -1,66 +0,0 @@
|
||||||
plugins {
|
|
||||||
alias(libs.plugins.android.application)
|
|
||||||
}
|
|
||||||
|
|
||||||
android {
|
|
||||||
namespace 'xyz.pixelatedw.avoid'
|
|
||||||
compileSdk 34
|
|
||||||
|
|
||||||
defaultConfig {
|
|
||||||
applicationId "xyz.pixelatedw.avoid"
|
|
||||||
minSdk 31
|
|
||||||
targetSdk 33
|
|
||||||
versionCode 1
|
|
||||||
versionName "1.0"
|
|
||||||
// need this otherwise it won't insert libc++_shared.so
|
|
||||||
externalNativeBuild {
|
|
||||||
cmake {
|
|
||||||
arguments "-DANDROID_STL=c++_shared"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// set up targets
|
|
||||||
ndk {
|
|
||||||
abiFilters 'arm64-v8a'
|
|
||||||
}
|
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
|
||||||
}
|
|
||||||
externalNativeBuild {
|
|
||||||
cmake {
|
|
||||||
path "CMakeLists.txt"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
buildTypes {
|
|
||||||
release {
|
|
||||||
minifyEnabled false
|
|
||||||
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
compileOptions {
|
|
||||||
sourceCompatibility JavaVersion.VERSION_1_8
|
|
||||||
targetCompatibility JavaVersion.VERSION_1_8
|
|
||||||
}
|
|
||||||
buildFeatures {
|
|
||||||
prefab true
|
|
||||||
}
|
|
||||||
// The final part to insert libc++_shared.so only
|
|
||||||
packagingOptions {
|
|
||||||
exclude 'lib/*/libdummy.so'
|
|
||||||
}
|
|
||||||
sourceSets {
|
|
||||||
main {
|
|
||||||
assets.srcDirs += files('../assets')
|
|
||||||
|
|
||||||
res.srcDirs += files('../assets/android-res')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
dependencies {
|
|
||||||
|
|
||||||
implementation libs.appcompat
|
|
||||||
implementation libs.material
|
|
||||||
implementation libs.games.activity
|
|
||||||
testImplementation libs.junit
|
|
||||||
androidTestImplementation libs.ext.junit
|
|
||||||
androidTestImplementation libs.espresso.core
|
|
||||||
}
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
xmlns:tools="http://schemas.android.com/tools">
|
|
||||||
|
|
||||||
<!-- android:icon="@mipmap/ic_launcher"-->
|
|
||||||
<!-- android:roundIcon="@mipmap/ic_launcher"-->
|
|
||||||
<application
|
|
||||||
android:label="Avoid"
|
|
||||||
android:theme="@style/Theme.AppCompat.NoActionBar"
|
|
||||||
tools:targetApi="33">
|
|
||||||
<activity
|
|
||||||
android:name=".MainActivity"
|
|
||||||
android:exported="true"
|
|
||||||
android:theme="@style/Theme.AppCompat.NoActionBar">
|
|
||||||
<meta-data
|
|
||||||
android:name="android.app.lib_name"
|
|
||||||
android:value="avoid" />
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.intent.action.MAIN" />
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
|
||||||
</intent-filter>
|
|
||||||
</activity>
|
|
||||||
</application>
|
|
||||||
|
|
||||||
</manifest>
|
|
||||||
|
|
@ -1,2 +0,0 @@
|
||||||
// Intentionally blank -- this is a dummy code!
|
|
||||||
// This is part of a hack to convince gradle to insert libc++_shared.so
|
|
||||||
|
|
@ -1,32 +0,0 @@
|
||||||
package xyz.pixelatedw.avoid;
|
|
||||||
|
|
||||||
import android.view.View;
|
|
||||||
|
|
||||||
import com.google.androidgamesdk.GameActivity;
|
|
||||||
|
|
||||||
public class MainActivity extends GameActivity {
|
|
||||||
static {
|
|
||||||
System.loadLibrary("avoid");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void onWindowFocusChanged(boolean hasFocus) {
|
|
||||||
super.onWindowFocusChanged(hasFocus);
|
|
||||||
|
|
||||||
if (hasFocus) {
|
|
||||||
hideSystemUi();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private void hideSystemUi() {
|
|
||||||
View decorView = getWindow().getDecorView();
|
|
||||||
decorView.setSystemUiVisibility(
|
|
||||||
View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
|
|
||||||
| View.SYSTEM_UI_FLAG_LAYOUT_STABLE
|
|
||||||
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
|
|
||||||
| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
|
|
||||||
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
|
|
||||||
| View.SYSTEM_UI_FLAG_FULLSCREEN
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,4 +0,0 @@
|
||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
|
||||||
plugins {
|
|
||||||
alias(libs.plugins.android.application) apply false
|
|
||||||
}
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
# Project-wide Gradle settings.
|
|
||||||
# IDE (e.g. Android Studio) users:
|
|
||||||
# Gradle settings configured through the IDE *will override*
|
|
||||||
# any settings specified in this file.
|
|
||||||
# For more details on how to configure your build environment visit
|
|
||||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
|
||||||
# Specifies the JVM arguments used for the daemon process.
|
|
||||||
# The setting is particularly useful for tweaking memory settings.
|
|
||||||
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
|
|
||||||
# When configured, Gradle will run in incubating parallel mode.
|
|
||||||
# This option should only be used with decoupled projects. For more details, visit
|
|
||||||
# https://developer.android.com/r/tools/gradle-multi-project-decoupled-projects
|
|
||||||
# org.gradle.parallel=true
|
|
||||||
# AndroidX package structure to make it clearer which packages are bundled with the
|
|
||||||
# Android operating system, and which are packaged with your app's APK
|
|
||||||
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
|
||||||
android.useAndroidX=true
|
|
||||||
# Enables namespacing of each library's R class so that its R class includes only the
|
|
||||||
# resources declared in the library itself and none from the library's dependencies,
|
|
||||||
# thereby reducing the size of the R class for that library
|
|
||||||
android.nonTransitiveRClass=true
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
[versions]
|
|
||||||
agp = "8.4.0"
|
|
||||||
junit = "4.13.2"
|
|
||||||
junitVersion = "1.1.5"
|
|
||||||
espressoCore = "3.5.1"
|
|
||||||
appcompat = "1.6.1"
|
|
||||||
material = "1.10.0"
|
|
||||||
gamesActivity = "2.0.2"
|
|
||||||
|
|
||||||
[libraries]
|
|
||||||
junit = { group = "junit", name = "junit", version.ref = "junit" }
|
|
||||||
ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
|
|
||||||
espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
|
|
||||||
appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
|
|
||||||
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
|
|
||||||
games-activity = { group = "androidx.games", name = "games-activity", version.ref = "gamesActivity" }
|
|
||||||
|
|
||||||
[plugins]
|
|
||||||
android-application = { id = "com.android.application", version.ref = "agp" }
|
|
||||||
Binary file not shown.
|
|
@ -1,7 +0,0 @@
|
||||||
distributionBase=GRADLE_USER_HOME
|
|
||||||
distributionPath=wrapper/dists
|
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
|
|
||||||
networkTimeout=10000
|
|
||||||
validateDistributionUrl=true
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
|
||||||
|
|
@ -1,251 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright © 2015-2021 the original authors.
|
|
||||||
#
|
|
||||||
# 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
|
|
||||||
#
|
|
||||||
# https://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.
|
|
||||||
#
|
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# Gradle start up script for POSIX generated by Gradle.
|
|
||||||
#
|
|
||||||
# Important for running:
|
|
||||||
#
|
|
||||||
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
|
||||||
# noncompliant, but you have some other compliant shell such as ksh or
|
|
||||||
# bash, then to run this script, type that shell name before the whole
|
|
||||||
# command line, like:
|
|
||||||
#
|
|
||||||
# ksh Gradle
|
|
||||||
#
|
|
||||||
# Busybox and similar reduced shells will NOT work, because this script
|
|
||||||
# requires all of these POSIX shell features:
|
|
||||||
# * functions;
|
|
||||||
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
|
||||||
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
|
||||||
# * compound commands having a testable exit status, especially «case»;
|
|
||||||
# * various built-in commands including «command», «set», and «ulimit».
|
|
||||||
#
|
|
||||||
# Important for patching:
|
|
||||||
#
|
|
||||||
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
|
||||||
# by Bash, Ksh, etc; in particular arrays are avoided.
|
|
||||||
#
|
|
||||||
# The "traditional" practice of packing multiple parameters into a
|
|
||||||
# space-separated string is a well documented source of bugs and security
|
|
||||||
# problems, so this is (mostly) avoided, by progressively accumulating
|
|
||||||
# options in "$@", and eventually passing that to Java.
|
|
||||||
#
|
|
||||||
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
|
||||||
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
|
||||||
# see the in-line comments for details.
|
|
||||||
#
|
|
||||||
# There are tweaks for specific operating systems such as AIX, CygWin,
|
|
||||||
# Darwin, MinGW, and NonStop.
|
|
||||||
#
|
|
||||||
# (3) This script is generated from the Groovy template
|
|
||||||
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
|
||||||
# within the Gradle project.
|
|
||||||
#
|
|
||||||
# You can find Gradle at https://github.com/gradle/gradle/.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
|
||||||
app_path=$0
|
|
||||||
|
|
||||||
# Need this for daisy-chained symlinks.
|
|
||||||
while
|
|
||||||
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
|
||||||
[ -h "$app_path" ]
|
|
||||||
do
|
|
||||||
ls=$( ls -ld "$app_path" )
|
|
||||||
link=${ls#*' -> '}
|
|
||||||
case $link in #(
|
|
||||||
/*) app_path=$link ;; #(
|
|
||||||
*) app_path=$APP_HOME$link ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# This is normally unused
|
|
||||||
# shellcheck disable=SC2034
|
|
||||||
APP_BASE_NAME=${0##*/}
|
|
||||||
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
|
||||||
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
|
||||||
MAX_FD=maximum
|
|
||||||
|
|
||||||
warn () {
|
|
||||||
echo "$*"
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
die () {
|
|
||||||
echo
|
|
||||||
echo "$*"
|
|
||||||
echo
|
|
||||||
exit 1
|
|
||||||
} >&2
|
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
|
||||||
cygwin=false
|
|
||||||
msys=false
|
|
||||||
darwin=false
|
|
||||||
nonstop=false
|
|
||||||
case "$( uname )" in #(
|
|
||||||
CYGWIN* ) cygwin=true ;; #(
|
|
||||||
Darwin* ) darwin=true ;; #(
|
|
||||||
MSYS* | MINGW* ) msys=true ;; #(
|
|
||||||
NONSTOP* ) nonstop=true ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD=$JAVA_HOME/jre/sh/java
|
|
||||||
else
|
|
||||||
JAVACMD=$JAVA_HOME/bin/java
|
|
||||||
fi
|
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD=java
|
|
||||||
if ! command -v java >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
|
||||||
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|
||||||
case $MAX_FD in #(
|
|
||||||
max*)
|
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
|
||||||
# shellcheck disable=SC2039,SC3045
|
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
|
||||||
warn "Could not query maximum file descriptor limit"
|
|
||||||
esac
|
|
||||||
case $MAX_FD in #(
|
|
||||||
'' | soft) :;; #(
|
|
||||||
*)
|
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
|
||||||
# shellcheck disable=SC2039,SC3045
|
|
||||||
ulimit -n "$MAX_FD" ||
|
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Collect all arguments for the java command, stacking in reverse order:
|
|
||||||
# * args from the command line
|
|
||||||
# * the main class name
|
|
||||||
# * -classpath
|
|
||||||
# * -D...appname settings
|
|
||||||
# * --module-path (only if needed)
|
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if "$cygwin" || "$msys" ; then
|
|
||||||
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
|
||||||
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
|
||||||
|
|
||||||
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
|
||||||
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
for arg do
|
|
||||||
if
|
|
||||||
case $arg in #(
|
|
||||||
-*) false ;; # don't mess with options #(
|
|
||||||
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
|
||||||
[ -e "$t" ] ;; #(
|
|
||||||
*) false ;;
|
|
||||||
esac
|
|
||||||
then
|
|
||||||
arg=$( cygpath --path --ignore --mixed "$arg" )
|
|
||||||
fi
|
|
||||||
# Roll the args list around exactly as many times as the number of
|
|
||||||
# args, so each arg winds up back in the position where it started, but
|
|
||||||
# possibly modified.
|
|
||||||
#
|
|
||||||
# NB: a `for` loop captures its iteration list before it begins, so
|
|
||||||
# changing the positional parameters here affects neither the number of
|
|
||||||
# iterations, nor the values presented in `arg`.
|
|
||||||
shift # remove old arg
|
|
||||||
set -- "$@" "$arg" # push replacement arg
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
||||||
|
|
||||||
# Collect all arguments for the java command:
|
|
||||||
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
|
||||||
# and any embedded shellness will be escaped.
|
|
||||||
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
|
||||||
# treated as '${Hostname}' itself on the command line.
|
|
||||||
|
|
||||||
set -- \
|
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
|
||||||
-classpath "$CLASSPATH" \
|
|
||||||
org.gradle.wrapper.GradleWrapperMain \
|
|
||||||
"$@"
|
|
||||||
|
|
||||||
# Stop when "xargs" is not available.
|
|
||||||
if ! command -v xargs >/dev/null 2>&1
|
|
||||||
then
|
|
||||||
die "xargs is not available"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Use "xargs" to parse quoted args.
|
|
||||||
#
|
|
||||||
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
|
||||||
#
|
|
||||||
# In Bash we could simply go:
|
|
||||||
#
|
|
||||||
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
|
||||||
# set -- "${ARGS[@]}" "$@"
|
|
||||||
#
|
|
||||||
# but POSIX shell has neither arrays nor command substitution, so instead we
|
|
||||||
# post-process each arg (as a line of input to sed) to backslash-escape any
|
|
||||||
# character that might be a shell metacharacter, then use eval to reverse
|
|
||||||
# that process (while maintaining the separation between arguments), and wrap
|
|
||||||
# the whole thing up as a single "set" statement.
|
|
||||||
#
|
|
||||||
# This will of course break if any of these variables contains a newline or
|
|
||||||
# an unmatched quote.
|
|
||||||
#
|
|
||||||
|
|
||||||
eval "set -- $(
|
|
||||||
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
|
||||||
xargs -n1 |
|
|
||||||
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
|
||||||
tr '\n' ' '
|
|
||||||
)" '"$@"'
|
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
|
||||||
|
|
@ -1,94 +0,0 @@
|
||||||
@rem
|
|
||||||
@rem Copyright 2015 the original author or authors.
|
|
||||||
@rem
|
|
||||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
@rem you may not use this file except in compliance with the License.
|
|
||||||
@rem You may obtain a copy of the License at
|
|
||||||
@rem
|
|
||||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@rem
|
|
||||||
@rem Unless required by applicable law or agreed to in writing, software
|
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
@rem See the License for the specific language governing permissions and
|
|
||||||
@rem limitations under the License.
|
|
||||||
@rem
|
|
||||||
@rem SPDX-License-Identifier: Apache-2.0
|
|
||||||
@rem
|
|
||||||
|
|
||||||
@if "%DEBUG%"=="" @echo off
|
|
||||||
@rem ##########################################################################
|
|
||||||
@rem
|
|
||||||
@rem Gradle startup script for Windows
|
|
||||||
@rem
|
|
||||||
@rem ##########################################################################
|
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
|
||||||
if "%DIRNAME%"=="" set DIRNAME=.
|
|
||||||
@rem This is normally unused
|
|
||||||
set APP_BASE_NAME=%~n0
|
|
||||||
set APP_HOME=%DIRNAME%
|
|
||||||
|
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
|
||||||
|
|
||||||
@rem Find java.exe
|
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
|
||||||
|
|
||||||
echo. 1>&2
|
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
|
||||||
echo. 1>&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
|
||||||
echo location of your Java installation. 1>&2
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
|
||||||
|
|
||||||
echo. 1>&2
|
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
|
||||||
echo. 1>&2
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
|
||||||
echo location of your Java installation. 1>&2
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:execute
|
|
||||||
@rem Setup the command line
|
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
|
||||||
|
|
||||||
:end
|
|
||||||
@rem End local scope for the variables with windows NT shell
|
|
||||||
if %ERRORLEVEL% equ 0 goto mainEnd
|
|
||||||
|
|
||||||
:fail
|
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
|
||||||
rem the _cmd.exe /c_ return code!
|
|
||||||
set EXIT_CODE=%ERRORLEVEL%
|
|
||||||
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
|
||||||
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
|
||||||
exit /b %EXIT_CODE%
|
|
||||||
|
|
||||||
:mainEnd
|
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
|
||||||
|
|
||||||
:omega
|
|
||||||
23
justfile
23
justfile
|
|
@ -1,23 +0,0 @@
|
||||||
|
|
||||||
run platform="pc":
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
if [ "{{platform}}" = "pc" ]; then
|
|
||||||
cargo run
|
|
||||||
elif [ "{{platform}}" = "mobile" ]; then
|
|
||||||
is_paired="$(adb get-state 1> /dev/null 2>&1 && echo "device attached" || echo "no device found")"
|
|
||||||
if [ "$is_paired" = "no device found" ]; then
|
|
||||||
echo "no device paired! run 'adb connect <target>'"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
adb install ./app/build/outputs/apk/debug/app-debug.apk
|
|
||||||
adb shell monkey -p xyz.pixelatedw.avoid 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
build platform="pc":
|
|
||||||
#!/usr/bin/env bash
|
|
||||||
cargo build
|
|
||||||
if [ "{{platform}}" = "mobile" ]; then
|
|
||||||
cargo ndk -t arm64-v8a -o ./app/src/main/jniLibs build --release --package avoid-rs
|
|
||||||
./gradlew build
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
@ -1,2 +1,2 @@
|
||||||
[toolchain]
|
[toolchain]
|
||||||
channel = "nightly-2025-04-07"
|
channel = "nightly-2025-02-03"
|
||||||
|
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
pluginManagement {
|
|
||||||
repositories {
|
|
||||||
google {
|
|
||||||
content {
|
|
||||||
includeGroupByRegex("com\\.android.*")
|
|
||||||
includeGroupByRegex("com\\.google.*")
|
|
||||||
includeGroupByRegex("androidx.*")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
mavenCentral()
|
|
||||||
gradlePluginPortal()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dependencyResolutionManagement {
|
|
||||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
|
||||||
repositories {
|
|
||||||
google()
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
rootProject.name = "Avoid"
|
|
||||||
include ':app'
|
|
||||||
|
|
@ -14,7 +14,6 @@ pub struct Mouse(pub Vec2);
|
||||||
|
|
||||||
fn mouse_position(
|
fn mouse_position(
|
||||||
mut mouse: ResMut<Mouse>,
|
mut mouse: ResMut<Mouse>,
|
||||||
touches: Res<Touches>,
|
|
||||||
window: Query<&Window>,
|
window: Query<&Window>,
|
||||||
camera: Query<(&Camera, &GlobalTransform)>,
|
camera: Query<(&Camera, &GlobalTransform)>,
|
||||||
) {
|
) {
|
||||||
|
|
@ -23,15 +22,7 @@ fn mouse_position(
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
|
|
||||||
let mut position = window.cursor_position();
|
if let Some(position) = window.cursor_position() {
|
||||||
|
|
||||||
if position.is_none() {
|
|
||||||
for touch in touches.iter() {
|
|
||||||
position = Some(touch.position())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(position) = position {
|
|
||||||
let Ok((camera, camera_transform)) = camera.get_single()
|
let Ok((camera, camera_transform)) = camera.get_single()
|
||||||
else {
|
else {
|
||||||
return;
|
return;
|
||||||
|
|
|
||||||
97
src/lib.rs
97
src/lib.rs
|
|
@ -1,97 +0,0 @@
|
||||||
use bevy::{
|
|
||||||
diagnostic::FrameTimeDiagnosticsPlugin,
|
|
||||||
prelude::*,
|
|
||||||
window::{WindowMode, WindowResolution},
|
|
||||||
};
|
|
||||||
use common::mouse::{Mouse, MousePlugin};
|
|
||||||
use gamepad::GamepadPlugin;
|
|
||||||
use level::LevelPlugin;
|
|
||||||
|
|
||||||
mod common;
|
|
||||||
mod enemy;
|
|
||||||
mod gamepad;
|
|
||||||
mod hud;
|
|
||||||
mod level;
|
|
||||||
mod player;
|
|
||||||
mod score;
|
|
||||||
|
|
||||||
pub const SCREEN_WIDTH: u32 = 480;
|
|
||||||
pub const SCREEN_HEIGHT: u32 = 720;
|
|
||||||
pub const START_POSITION: Vec3 =
|
|
||||||
Vec3::new((SCREEN_WIDTH / 2) as f32, (SCREEN_HEIGHT / 2) as f32, 0.0);
|
|
||||||
|
|
||||||
#[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
|
|
||||||
pub enum GameState {
|
|
||||||
#[default]
|
|
||||||
Menu,
|
|
||||||
Playing,
|
|
||||||
GameOver,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Event, Default)]
|
|
||||||
struct GameOverEvent;
|
|
||||||
|
|
||||||
#[derive(Event, Default)]
|
|
||||||
struct GameStartEvent;
|
|
||||||
|
|
||||||
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
|
||||||
commands.spawn((
|
|
||||||
Camera2d,
|
|
||||||
Transform::from_xyz((SCREEN_WIDTH / 2) as f32, (SCREEN_HEIGHT / 2) as f32, 1.0),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
fn debug_mouse(mouse: Res<Mouse>) {
|
|
||||||
// println!("x: {} y: {}", mouse.x, mouse.y);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[bevy_main]
|
|
||||||
fn main() {
|
|
||||||
run_game();
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn run_game() {
|
|
||||||
App::new()
|
|
||||||
.add_plugins((
|
|
||||||
DefaultPlugins
|
|
||||||
.build()
|
|
||||||
.set(WindowPlugin {
|
|
||||||
primary_window: Some(Window {
|
|
||||||
title: "Avoid".to_string(),
|
|
||||||
name: Some("avoid.app".to_string()),
|
|
||||||
resizable: false,
|
|
||||||
position: WindowPosition::Centered(MonitorSelection::Current),
|
|
||||||
resolution: WindowResolution::new(
|
|
||||||
SCREEN_WIDTH as f32,
|
|
||||||
SCREEN_HEIGHT as f32,
|
|
||||||
),
|
|
||||||
..Default::default()
|
|
||||||
}),
|
|
||||||
..Default::default()
|
|
||||||
})
|
|
||||||
.set(ImagePlugin::default_nearest()),
|
|
||||||
FrameTimeDiagnosticsPlugin,
|
|
||||||
// EmbeddedAssetPlugin,
|
|
||||||
LevelPlugin,
|
|
||||||
MousePlugin,
|
|
||||||
GamepadPlugin,
|
|
||||||
))
|
|
||||||
.init_state::<GameState>()
|
|
||||||
.add_event::<GameOverEvent>()
|
|
||||||
.add_event::<GameStartEvent>()
|
|
||||||
.add_systems(Startup, setup)
|
|
||||||
.add_systems(Update, debug_mouse)
|
|
||||||
.run();
|
|
||||||
}
|
|
||||||
|
|
||||||
struct EmbeddedAssetPlugin;
|
|
||||||
|
|
||||||
// impl Plugin for EmbeddedAssetPlugin {
|
|
||||||
// fn build(&self, app: &mut App) {
|
|
||||||
// let prefix = "avoid-rs/";
|
|
||||||
//
|
|
||||||
// // embedded_asset!(app, "../assets/player.png");
|
|
||||||
// embedded_asset!(app, "../assets/Xolonium-Regular.ttf");
|
|
||||||
// // embedded_asset!(app, "./assets/Xolonium-Regular.ttf");
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
93
src/main.rs
93
src/main.rs
|
|
@ -1,3 +1,92 @@
|
||||||
fn main() {
|
use bevy::{
|
||||||
avoid::run_game();
|
diagnostic::FrameTimeDiagnosticsPlugin,
|
||||||
|
prelude::*,
|
||||||
|
window::{WindowMode, WindowResolution},
|
||||||
|
};
|
||||||
|
use common::mouse::{Mouse, MousePlugin};
|
||||||
|
use gamepad::GamepadPlugin;
|
||||||
|
use level::LevelPlugin;
|
||||||
|
|
||||||
|
mod common;
|
||||||
|
mod enemy;
|
||||||
|
mod gamepad;
|
||||||
|
mod hud;
|
||||||
|
mod level;
|
||||||
|
mod player;
|
||||||
|
mod score;
|
||||||
|
|
||||||
|
pub const SCREEN_WIDTH: u32 = 480;
|
||||||
|
pub const SCREEN_HEIGHT: u32 = 720;
|
||||||
|
pub const START_POSITION: Vec3 =
|
||||||
|
Vec3::new((SCREEN_WIDTH / 2) as f32, (SCREEN_HEIGHT / 2) as f32, 0.0);
|
||||||
|
|
||||||
|
#[derive(Clone, Eq, PartialEq, Debug, Hash, Default, States)]
|
||||||
|
pub enum GameState {
|
||||||
|
#[default]
|
||||||
|
Menu,
|
||||||
|
Playing,
|
||||||
|
GameOver,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Event, Default)]
|
||||||
|
struct GameOverEvent;
|
||||||
|
|
||||||
|
#[derive(Event, Default)]
|
||||||
|
struct GameStartEvent;
|
||||||
|
|
||||||
|
fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
|
||||||
|
commands.spawn((
|
||||||
|
Camera2d,
|
||||||
|
Transform::from_xyz((SCREEN_WIDTH / 2) as f32, (SCREEN_HEIGHT / 2) as f32, 1.0),
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
fn debug_mouse(mouse: Res<Mouse>) {
|
||||||
|
// println!("x: {} y: {}", mouse.x, mouse.y);
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
App::new()
|
||||||
|
.add_plugins((
|
||||||
|
DefaultPlugins
|
||||||
|
.build()
|
||||||
|
.set(WindowPlugin {
|
||||||
|
primary_window: Some(Window {
|
||||||
|
title: "Avoid".to_string(),
|
||||||
|
name: Some("avoid.app".to_string()),
|
||||||
|
resizable: false,
|
||||||
|
position: WindowPosition::Centered(MonitorSelection::Current),
|
||||||
|
resolution: WindowResolution::new(
|
||||||
|
SCREEN_WIDTH as f32,
|
||||||
|
SCREEN_HEIGHT as f32,
|
||||||
|
),
|
||||||
|
..Default::default()
|
||||||
|
}),
|
||||||
|
..Default::default()
|
||||||
|
})
|
||||||
|
.set(ImagePlugin::default_nearest()),
|
||||||
|
FrameTimeDiagnosticsPlugin,
|
||||||
|
// EmbeddedAssetPlugin,
|
||||||
|
LevelPlugin,
|
||||||
|
MousePlugin,
|
||||||
|
GamepadPlugin,
|
||||||
|
))
|
||||||
|
.init_state::<GameState>()
|
||||||
|
.add_event::<GameOverEvent>()
|
||||||
|
.add_event::<GameStartEvent>()
|
||||||
|
.add_systems(Startup, setup)
|
||||||
|
.add_systems(Update, debug_mouse)
|
||||||
|
.run();
|
||||||
|
}
|
||||||
|
|
||||||
|
struct EmbeddedAssetPlugin;
|
||||||
|
|
||||||
|
// impl Plugin for EmbeddedAssetPlugin {
|
||||||
|
// fn build(&self, app: &mut App) {
|
||||||
|
// let prefix = "avoid-rs/";
|
||||||
|
//
|
||||||
|
// // embedded_asset!(app, "../assets/player.png");
|
||||||
|
// embedded_asset!(app, "../assets/Xolonium-Regular.ttf");
|
||||||
|
// // embedded_asset!(app, "./assets/Xolonium-Regular.ttf");
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,9 @@
|
||||||
use std::f32::consts::PI;
|
use std::f32::consts::PI;
|
||||||
|
|
||||||
use bevy::{input::touch::Touch, prelude::*};
|
use bevy::prelude::*;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
common::{animation::SpriteAnimation, mouse::Mouse, velocity::Velocity},
|
common::{animation::SpriteAnimation, velocity::Velocity},
|
||||||
level::Unit,
|
level::Unit,
|
||||||
GameState, START_POSITION,
|
GameState, START_POSITION,
|
||||||
};
|
};
|
||||||
|
|
@ -55,7 +55,6 @@ fn setup(
|
||||||
fn move_player(
|
fn move_player(
|
||||||
keys: Res<ButtonInput<KeyCode>>,
|
keys: Res<ButtonInput<KeyCode>>,
|
||||||
gamepads: Query<&Gamepad>,
|
gamepads: Query<&Gamepad>,
|
||||||
mouse: Res<Mouse>,
|
|
||||||
mut query: Query<(&mut Transform, &mut Velocity), With<Player>>,
|
mut query: Query<(&mut Transform, &mut Velocity), With<Player>>,
|
||||||
window: Query<&Window>,
|
window: Query<&Window>,
|
||||||
) {
|
) {
|
||||||
|
|
@ -67,10 +66,6 @@ fn move_player(
|
||||||
handle_gamepad_movement(gamepad, &mut velocity);
|
handle_gamepad_movement(gamepad, &mut velocity);
|
||||||
}
|
}
|
||||||
|
|
||||||
let position = Vec2::new(transform.translation.x, transform.translation.y);
|
|
||||||
|
|
||||||
velocity.0 = (mouse.0 - position).normalize() * 0.8;
|
|
||||||
|
|
||||||
if keys.pressed(KeyCode::ArrowRight) {
|
if keys.pressed(KeyCode::ArrowRight) {
|
||||||
velocity.x += 1.0;
|
velocity.x += 1.0;
|
||||||
}
|
}
|
||||||
|
|
@ -84,19 +79,16 @@ fn move_player(
|
||||||
velocity.y -= 1.0;
|
velocity.y -= 1.0;
|
||||||
}
|
}
|
||||||
|
|
||||||
let distance_to_target = position - mouse.0;
|
if velocity.length() > 0.0 {
|
||||||
if distance_to_target.length() > 10.0 {
|
velocity.0 = velocity.normalize() * 400.0;
|
||||||
if velocity.length() > 0.0 {
|
let angle = velocity.to_angle() - PI / 2.0;
|
||||||
velocity.0 = velocity.normalize() * 400.0;
|
let angle = Quat::from_rotation_z(angle);
|
||||||
let angle = velocity.to_angle() - PI / 2.0;
|
transform.rotation = angle;
|
||||||
let angle = Quat::from_rotation_z(angle);
|
|
||||||
transform.rotation = angle;
|
|
||||||
}
|
|
||||||
|
|
||||||
let window = window.single();
|
|
||||||
let screen_size: Vec3 = window.physical_size().as_vec2().extend(1.0);
|
|
||||||
transform.translation = transform.translation.clamp(Vec3::ZERO, screen_size);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let window = window.single();
|
||||||
|
let screen_size: Vec3 = window.physical_size().as_vec2().extend(1.0);
|
||||||
|
transform.translation = transform.translation.clamp(Vec3::ZERO, screen_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
fn handle_gamepad_movement(gamepad: &Gamepad, velocity: &mut Velocity) {
|
fn handle_gamepad_movement(gamepad: &Gamepad, velocity: &mut Velocity) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue