diff --git a/.gitignore b/.gitignore index ea8c4bf..de84849 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,37 @@ -/target +# Rust/Cargo +debug/ +target/ +Cargo.lock +**/*.rs.bk +*.pdb + +# 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 diff --git a/Cargo.lock b/Cargo.lock index 0c08acc..7d8701e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -290,7 +290,7 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "avoid-rs" -version = "0.2.0" +version = "0.2.1" dependencies = [ "bevy", "fastrand", diff --git a/Cargo.toml b/Cargo.toml index b881a8b..e920c16 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,15 @@ name = "avoid-rs" version = "0.2.1" edition = "2021" +[lib] +name = "avoid" +path = "src/lib.rs" +crate-type = [ + "staticlib", + "cdylib", # needed for Android + "rlib", # rlib needed for running locally +] + [dependencies] bevy = { version = "0.15.2", features = ["wav"] } fastrand = "*" diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt new file mode 100644 index 0000000..c388547 --- /dev/null +++ b/app/CMakeLists.txt @@ -0,0 +1,5 @@ +# 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) diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..3d45c2c --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,66 @@ +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 +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..97568d3 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/cpp/dummy.cpp b/app/src/main/cpp/dummy.cpp new file mode 100644 index 0000000..c20beb8 --- /dev/null +++ b/app/src/main/cpp/dummy.cpp @@ -0,0 +1,2 @@ +// Intentionally blank -- this is a dummy code! +// This is part of a hack to convince gradle to insert libc++_shared.so \ No newline at end of file diff --git a/app/src/main/java/xyz/pixelatedw/avoid/MainActivity.java b/app/src/main/java/xyz/pixelatedw/avoid/MainActivity.java new file mode 100644 index 0000000..c363c3f --- /dev/null +++ b/app/src/main/java/xyz/pixelatedw/avoid/MainActivity.java @@ -0,0 +1,32 @@ +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 + ); + } +} diff --git a/app/src/main/jniLibs/arm64-v8a/libavoid.so b/app/src/main/jniLibs/arm64-v8a/libavoid.so new file mode 100755 index 0000000..2cb0043 Binary files /dev/null and b/app/src/main/jniLibs/arm64-v8a/libavoid.so differ diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..327342f --- /dev/null +++ b/build.gradle @@ -0,0 +1,4 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. +plugins { + alias(libs.plugins.android.application) apply false +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..4387edc --- /dev/null +++ b/gradle.properties @@ -0,0 +1,21 @@ +# 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 \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..88e55de --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,19 @@ +[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" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e18bc25 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +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 diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..f3b75f3 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/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" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9b42019 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@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 diff --git a/rust-toolchain.toml b/rust-toolchain.toml index f6e077d..f85d150 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly-2025-02-03" +channel = "nightly-2025-04-07" diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..ee718da --- /dev/null +++ b/settings.gradle @@ -0,0 +1,23 @@ +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' diff --git a/src/lib.rs b/src/lib.rs new file mode 100644 index 0000000..71c86be --- /dev/null +++ b/src/lib.rs @@ -0,0 +1,97 @@ +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) { + commands.spawn(( + Camera2d, + Transform::from_xyz((SCREEN_WIDTH / 2) as f32, (SCREEN_HEIGHT / 2) as f32, 1.0), + )); +} + +fn debug_mouse(mouse: Res) { + // 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::() + .add_event::() + .add_event::() + .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"); +// } +// } diff --git a/src/main.rs b/src/main.rs index a387520..69ab5a6 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,92 +1,3 @@ -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) { - commands.spawn(( - Camera2d, - Transform::from_xyz((SCREEN_WIDTH / 2) as f32, (SCREEN_HEIGHT / 2) as f32, 1.0), - )); -} - -fn debug_mouse(mouse: Res) { - // 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::() - .add_event::() - .add_event::() - .add_systems(Startup, setup) - .add_systems(Update, debug_mouse) - .run(); + avoid::run_game(); } - -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"); -// } -// }