archive-gh-me/maplibre-rs
1
0
Fork 0
mirror of https://github.com/maplibre/maplibre-rs.git synced 2025-12-08 19:05:57 +00:00
Code Issues Projects Releases Wiki Activity

Format files

Browse Source
This commit is contained in:
Maximilian Ammann 2022-04-23 18:39:51 +02:00
parent 01f86dff1c
commit d478775113
4 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
android/src/lib.rs
View File

@ -1,10 +1,10 @@
use std::ffi::CString;
use jni::objects::JClass;
use jni::JNIEnv;
use log::Level;
use maplibre::window::FromWindow;
use maplibre::{MapBuilder, ScheduleMethod, TokioScheduleMethod};
use std::ffi::CString;
pub use std::time::Instant;
use jni::JNIEnv;
use jni::objects::JClass;
use log::Level;
// TODO clippy
// #[cfg(not(target_os = "android"))]
@ -24,7 +24,7 @@ pub fn android_main() {
pub extern "system" fn Java_com_example_demo_MapLibre_android_1main(env: JNIEnv, class: JClass) {
let tag = CString::new("maplibre").unwrap();
let message = CString::new("maplibre WOORKING").unwrap();
ndk_glue::android_log(Level::Warn, &tag,&message);
ndk_glue::android_log(Level::Warn, &tag, &message);
//android_main();
}
}

23
maplibre/src/map_state.rs
View File

@ -122,7 +122,7 @@ impl<W> MapState<W> {
}
TessellateMessage::Tile(TileTessellateMessage { request_id, coords }) => loop {
if let Ok(mut tile_request_state) =
self.shared_thread_state.tile_request_state.try_lock()
self.shared_thread_state.tile_request_state.try_lock()
{
tile_request_state.finish_tile_request(request_id);
tracing::trace!("Tile at {} finished loading", coords);
@ -170,10 +170,14 @@ impl<W> MapState<W> {
drop(_guard);
if let Some(view_region) = &view_region {
self.render_state.as_mut().expect("render state not yet initialized. Call reinitialize().").upload_tile_geometry(view_region, &self.style, &self.tile_cache);
self.render_state
.as_mut()
.expect("render state not yet initialized. Call reinitialize().")
.upload_tile_geometry(view_region, &self.style, &self.tile_cache);
let zoom = self.zoom();
self.render_state_mut().update_tile_view_pattern(view_region, &view_proj, zoom);
self.render_state_mut()
.update_tile_view_pattern(view_region, &view_proj, zoom);
self.render_state_mut().update_metadata();
}
@ -296,7 +300,9 @@ impl<W> MapState<W> {
}
pub fn render_state(&self) -> &RenderState {
self.render_state.as_ref().expect("render state not yet initialized. Call reinitialize().")
self.render_state
.as_ref()
.expect("render state not yet initialized. Call reinitialize().")
}
pub fn render_state_mut(&mut self) -> &'_ mut RenderState {
@ -305,11 +311,14 @@ impl<W> MapState<W> {
}
impl<W> MapState<W>
where
W: raw_window_handle::HasRawWindowHandle,
where
W: raw_window_handle::HasRawWindowHandle,
{
pub fn recreate_surface(&mut self) {
self.render_state.as_mut().expect("render state not yet initialized. Call reinitialize().").recreate_surface(&self.window);
self.render_state
.as_mut()
.expect("render state not yet initialized. Call reinitialize().")
.recreate_surface(&self.window);
}
pub fn is_initialized(&self) -> bool {

3
maplibre/src/render/render_state.rs
View File

@ -132,7 +132,8 @@ impl RenderState {
},
None,
)
.await.ok()?;
.await
.ok()?;
surface.configure(&device, &surface_config);

10
maplibre/src/winit.rs
View File

@ -133,11 +133,7 @@ impl FromWindow for MapBuilder<winit::window::Window, winit::event_loop::EventLo
.build(&event_loop)
.unwrap();
let size = window.inner_size();
(
window,
WindowSize::new(100, 100).unwrap(),
event_loop,
)
(window, WindowSize::new(100, 100).unwrap(), event_loop)
}))
}
}
@ -168,7 +164,7 @@ pub fn get_canvas(element_id: &'static str) -> web_sys::HtmlCanvasElement {
#[cfg(target_arch = "wasm32")]
impl crate::window::FromCanvas
for MapBuilder<winit::window::Window, winit::event_loop::EventLoop<()>>
for MapBuilder<winit::window::Window, winit::event_loop::EventLoop<()>>
{
fn from_canvas(dom_id: &'static str) -> Self {
let event_loop = EventLoop::new();
@ -188,7 +184,7 @@ for MapBuilder<winit::window::Window, winit::event_loop::EventLoop<()>>
size.width.try_into().unwrap(),
size.height.try_into().unwrap(),
)
.unwrap(),
.unwrap(),
event_loop,
)
}))