From 2264826535fdaa364377c8cd719ef5320f382834 Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Sun, 3 Jul 2022 14:46:27 +0100 Subject: [PATCH] Update examples to use android_activity --- examples/agdk-egui/Cargo.toml | 4 ++-- examples/agdk-egui/src/lib.rs | 4 ++-- examples/agdk-mainloop/Cargo.toml | 2 +- examples/agdk-mainloop/src/lib.rs | 2 +- examples/agdk-winit-wgpu/Cargo.toml | 4 ++-- examples/agdk-winit-wgpu/src/lib.rs | 9 +++------ examples/na-mainloop/Cargo.toml | 2 +- examples/na-mainloop/src/lib.rs | 2 +- examples/na-subclass-jni/Cargo.toml | 2 +- examples/na-subclass-jni/src/lib.rs | 6 ++---- examples/na-winit-wgpu/Cargo.toml | 5 +++-- examples/na-winit-wgpu/src/lib.rs | 4 ++-- 12 files changed, 21 insertions(+), 25 deletions(-) diff --git a/examples/agdk-egui/Cargo.toml b/examples/agdk-egui/Cargo.toml index e355382..21774e5 100644 --- a/examples/agdk-egui/Cargo.toml +++ b/examples/agdk-egui/Cargo.toml @@ -17,7 +17,7 @@ egui-winit = { version = "0.18", default-features = false } egui_demo_lib = "0.18" [patch.crates-io] -winit = { git = "https://github.com/rib/winit", branch = "agdk-game-activity" } +winit = { git = "https://github.com/rib/winit", branch = "android-activity" } #winit = { path="../../../winit" } egui = { git = "https://github.com/emilk/egui" } @@ -37,7 +37,7 @@ env_logger = "0.9" [target.'cfg(target_os = "android")'.dependencies] android_logger = "0.11.0" -game-activity = { path="../../game-activity" } +android-activity = { path="../../android-activity", features = [ "game-activity" ] } [features] default = [] diff --git a/examples/agdk-egui/src/lib.rs b/examples/agdk-egui/src/lib.rs index 18c2979..267d92b 100644 --- a/examples/agdk-egui/src/lib.rs +++ b/examples/agdk-egui/src/lib.rs @@ -1,11 +1,11 @@ use log::Level; use winit::event_loop::{EventLoopWindowTarget, EventLoopBuilder, EventLoop}; +#[cfg(target_os="android")] +use android_activity::AndroidApp; #[cfg(target_os="android")] use winit::platform::android::EventLoopBuilderExtAndroid; -use game_activity::AndroidApp; - use winit::{ event_loop::{ControlFlow}, }; diff --git a/examples/agdk-mainloop/Cargo.toml b/examples/agdk-mainloop/Cargo.toml index 370da6a..ae0f144 100644 --- a/examples/agdk-mainloop/Cargo.toml +++ b/examples/agdk-mainloop/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] log = "0.4" android_logger = "0.11.0" -game-activity = { path="../../game-activity" } +android-activity = { path="../../android-activity", features = "game-activity" } [lib] name="main" diff --git a/examples/agdk-mainloop/src/lib.rs b/examples/agdk-mainloop/src/lib.rs index 6652879..145f96a 100644 --- a/examples/agdk-mainloop/src/lib.rs +++ b/examples/agdk-mainloop/src/lib.rs @@ -1,4 +1,4 @@ -use game_activity::{AndroidApp, PollEvent, MainEvent}; +use android_activity::{AndroidApp, PollEvent, MainEvent}; use log::info; #[no_mangle] diff --git a/examples/agdk-winit-wgpu/Cargo.toml b/examples/agdk-winit-wgpu/Cargo.toml index 8782b15..ad1c2b7 100644 --- a/examples/agdk-winit-wgpu/Cargo.toml +++ b/examples/agdk-winit-wgpu/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] log = "0.4" -winit = { git = "https://github.com/rib/winit", branch = "agdk-game-activity" } +winit = { git = "https://github.com/rib/winit", branch = "android-activity"} #winit = { path="../../../winit" } wgpu = "0.12.0" pollster = "0.2" @@ -17,7 +17,7 @@ env_logger = "0.9" [target.'cfg(target_os = "android")'.dependencies] android_logger = "0.11.0" -game-activity = { path="../../game-activity" } +android-activity = { path="../../android-activity", features = [ "game-activity" ] } [features] default = [] diff --git a/examples/agdk-winit-wgpu/src/lib.rs b/examples/agdk-winit-wgpu/src/lib.rs index 25a999a..640e414 100644 --- a/examples/agdk-winit-wgpu/src/lib.rs +++ b/examples/agdk-winit-wgpu/src/lib.rs @@ -6,8 +6,6 @@ use std::sync::{Arc, RwLock}; use log::Level; use log::trace; -use game_activity::AndroidApp; - use wgpu::TextureFormat; use wgpu::{Instance, Adapter, Device, ShaderModule, PipelineLayout, RenderPipeline, Queue}; @@ -16,6 +14,8 @@ use winit::{ event_loop::{ControlFlow, EventLoop, EventLoopBuilder, EventLoopWindowTarget}, }; +#[cfg(target_os="android")] +use game_activity::AndroidApp; #[cfg(target_os="android")] use winit::platform::android::EventLoopBuilderExtAndroid; @@ -314,7 +314,7 @@ fn _main(event_loop: EventLoop<()>) { #[cfg(target_os="android")] #[no_mangle] -extern "C" fn android_main(app: AndroidApp) { +fn android_main(app: AndroidApp) { android_logger::init_once( android_logger::Config::default().with_min_level(Level::Trace) ); @@ -324,9 +324,6 @@ extern "C" fn android_main(app: AndroidApp) { .build(); _main(event_loop); } -// Stop rust-analyzer from complaining that this file doesn't have a main() function... -#[cfg(target_os="android")] -fn main() {} #[cfg(not(target_os="android"))] fn main() { diff --git a/examples/na-mainloop/Cargo.toml b/examples/na-mainloop/Cargo.toml index 2e0b168..6280913 100644 --- a/examples/na-mainloop/Cargo.toml +++ b/examples/na-mainloop/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] log = "0.4" android_logger = "0.11.0" -native-activity = { path="../../native-activity" } +android-activity = { path="../../android-activity", features = [ "native-activity" ] } [lib] #name="na_mainloop" diff --git a/examples/na-mainloop/src/lib.rs b/examples/na-mainloop/src/lib.rs index b71179c..7cc5e33 100644 --- a/examples/na-mainloop/src/lib.rs +++ b/examples/na-mainloop/src/lib.rs @@ -1,4 +1,4 @@ -use native_activity::{PollEvent, MainEvent, AndroidApp}; +use android_activity::{PollEvent, MainEvent, AndroidApp}; use log::info; #[no_mangle] diff --git a/examples/na-subclass-jni/Cargo.toml b/examples/na-subclass-jni/Cargo.toml index a27c005..a33e572 100644 --- a/examples/na-subclass-jni/Cargo.toml +++ b/examples/na-subclass-jni/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] log = "0.4" android_logger = "0.11.0" -native-activity = { path="../../native-activity" } +android-activity = { path="../../android-activity", features = [ "native-activity" ] } ndk-context = "0.1" jni = "0.19" diff --git a/examples/na-subclass-jni/src/lib.rs b/examples/na-subclass-jni/src/lib.rs index 5ffcbf6..6c3a82f 100644 --- a/examples/na-subclass-jni/src/lib.rs +++ b/examples/na-subclass-jni/src/lib.rs @@ -1,5 +1,5 @@ -use native_activity::{PollEvent, MainEvent}; +use android_activity::{PollEvent, MainEvent, AndroidApp}; use log::Level; use log::{trace, info}; use std::time::Duration; @@ -11,8 +11,7 @@ struct AppState { } #[no_mangle] -extern "C" fn android_main() { - +fn android_main(app: AndroidApp) { android_logger::init_once( android_logger::Config::default().with_min_level(Level::Info) ); @@ -21,7 +20,6 @@ extern "C" fn android_main() { let mut redraw_pending = true; let mut render_state: Option<()> = Default::default(); - let app = native_activity::android_app(); while !quit { app.poll_events(Some(Duration::from_millis(500)) /* timeout */, |event| { match event { diff --git a/examples/na-winit-wgpu/Cargo.toml b/examples/na-winit-wgpu/Cargo.toml index 182fa03..00e9107 100644 --- a/examples/na-winit-wgpu/Cargo.toml +++ b/examples/na-winit-wgpu/Cargo.toml @@ -7,7 +7,8 @@ edition = "2021" [dependencies] log = "0.4" -winit = { version = "0.26", default-features = false, features = [ "native-activity" ] } +winit = { git = "https://github.com/rib/winit", branch = "android-activity" } +#winit = { path="../../../winit" } wgpu = "0.12.0" pollster = "0.2" @@ -16,7 +17,7 @@ env_logger = "0.9" [target.'cfg(target_os = "android")'.dependencies] android_logger = "0.11.0" -native-activity = { path="../../native-activity" } +android-activity = { path="../../android-activity", features = [ "native-activity" ] } [features] default = [] diff --git a/examples/na-winit-wgpu/src/lib.rs b/examples/na-winit-wgpu/src/lib.rs index 1bc521f..cf65658 100644 --- a/examples/na-winit-wgpu/src/lib.rs +++ b/examples/na-winit-wgpu/src/lib.rs @@ -9,13 +9,13 @@ use log::trace; use wgpu::TextureFormat; use wgpu::{Instance, Adapter, Device, ShaderModule, PipelineLayout, RenderPipeline, Queue}; -use native_activity::AndroidApp; - use winit::{ event::{Event, WindowEvent}, event_loop::{ControlFlow, EventLoop, EventLoopWindowTarget, EventLoopBuilder}, }; +#[cfg(target_os="android")] +use android_activity::AndroidApp; #[cfg(target_os="android")] use winit::platform::android::EventLoopBuilderExtAndroid;