Add back more code

vE5li · Apr 14, 2024 · a71c7de · a71c7de
1 parent b78a90a
commit a71c7de
Show file tree

Hide file tree

Showing 16 changed files with 335 additions and 287 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 # Rust
 target/
-*/target
 
 # Korangar
 korangar/client/

diff --git a/korangar/src/graphics/renderers/deferred/mod.rs b/korangar/src/graphics/renderers/deferred/mod.rs
@@ -20,6 +20,7 @@ use std::sync::Arc;
 #[cfg(feature = "debug")]
 use cgmath::SquareMatrix;
 use cgmath::{Matrix4, Vector2, Vector3};
+use korangar_interface::settings::FontSizeTrait;
 use korangar_procedural::profile;
 use vulkano::device::{DeviceOwned, Queue};
 use vulkano::format::Format;
@@ -50,7 +51,7 @@ use crate::graphics::{
     SpriteRenderer as SpriteRendererTrait, *,
 };
 use crate::interface::layout::{ScreenClip, ScreenPosition, ScreenSize};
-use crate::loaders::{GameFileLoader, TextureLoader};
+use crate::loaders::{FontSize, GameFileLoader, TextureLoader};
 use crate::network::EntityId;
 #[cfg(feature = "debug")]
 use crate::world::{BoundingBox, MarkerIdentifier};
@@ -387,7 +388,7 @@ impl DeferredRenderer {
         text: &str,
         mut position: ScreenPosition,
         color: Color,
-        font_size: f32,
+        font_size: FontSize,
     ) {
         let window_size = self.get_window_size();
 
@@ -398,13 +399,13 @@ impl DeferredRenderer {
                 self.font_map.clone(),
                 window_size,
                 position,
-                ScreenSize::uniform(font_size),
+                ScreenSize::uniform(font_size.get_value()),
                 color,
                 10,
                 index,
                 true,
             );
-            position.left += font_size / 2.0;
+            position.left += font_size.get_value() / 2.0;
         }
     }
 

diff --git a/korangar/src/input/event.rs b/korangar/src/input/event.rs
@@ -3,9 +3,8 @@ use korangar_interface::event::ClickAction;
 use korangar_interface::ElementEvent;
 
 use super::HotbarSlot;
-use crate::interface::application::Adapter;
+use crate::interface::application::{Adapter, InternalThemeKind};
 use crate::interface::resource::Move;
-use crate::interface::theme::ThemeKind;
 use crate::loaders::ServiceId;
 use crate::network::{AccountId, CharacterId, CharacterServerInformation, EntityId};
 #[cfg(feature = "debug")]
@@ -31,11 +30,15 @@ pub enum UserEvent {
     OpenGraphicsSettingsWindow,
     OpenAudioSettingsWindow,
     OpenFriendsWindow,
+    SetThemeFile {
+        theme_file: String,
+        theme_kind: InternalThemeKind,
+    },
     SaveTheme {
-        theme_kind: Option<ThemeKind>,
+        theme_kind: InternalThemeKind,
     },
     ReloadTheme {
-        theme_kind: Option<ThemeKind>,
+        theme_kind: InternalThemeKind,
     },
     SelectCharacter(usize),
     OpenCharacterCreationWindow(usize),

diff --git a/korangar/src/input/mod.rs b/korangar/src/input/mod.rs
@@ -23,6 +23,7 @@ use crate::graphics::{PickerRenderTarget, PickerTarget};
 use crate::interface::application::Adapter;
 use crate::interface::cursor::{MouseCursor, MouseCursorState};
 use crate::interface::layout::{ScreenPosition, ScreenSize};
+use crate::interface::resource::PartialMove;
 use crate::network::ClientTick;
 
 const MOUSE_SCOLL_MULTIPLIER: f32 = 30.0;
@@ -226,21 +227,17 @@ impl InputSystem {
                         }
 
                         ClickAction::Move(drop_resource) => {
-                            todo!();
-                            //self.mouse_input_mode =
-                            // MouseInputMode::MoveItem(item_source, item);
+                            let input_mode = match drop_resource {
+                                PartialMove::Item { source, item } => MouseInputMode::MoveItem(source, item),
+                                PartialMove::Skill { source, skill } => MouseInputMode::MoveSkill(source, skill),
+                            };
+                            self.mouse_input_mode = input_mode;
                             // Needs to re-render because some elements will
                             // render differently
                             // based on the mouse input mode.
-                            //interface.schedule_render();
+                            interface.schedule_render();
                         }
 
-                        // ClickAction::MoveSkill(skill_source, skill) => {
-                        //     self.mouse_input_mode = MouseInputMode::MoveSkill(skill_source, skill);
-                        //     // Needs to re-render because some elements will render differently
-                        //     // based on the mouse input mode.
-                        //     interface.schedule_render();
-                        // }
                         ClickAction::OpenWindow(prototype_window) => {
                             interface.open_window(application, focus_state, prototype_window.as_ref())
                         }
@@ -270,27 +267,23 @@ impl InputSystem {
                 // based on the mouse input mode.
                 interface.schedule_render();
 
-                println!("Implement drop!");
-                // match mouse_input_mode {
-                //     MouseInputMode::MoveItem(item_source, item) => {
-                //         if let Some(hovered_element) = &hovered_element {
-                //             if let Some(item_move) =
-                // hovered_element.borrow_mut().drop_item(item_source, item) {
-                //                 events.push(UserEvent::MoveItem(item_move));
-                //             }
-                //         }
-                //     }
-                //     MouseInputMode::MoveSkill(skill_source, skill) => {
-                //         if let Some(hovered_element) = &hovered_element {
-                //             if let Some(skill_move) =
-                // hovered_element.borrow_mut().drop_skill(skill_source, skill)
-                // {
-                // events.push(UserEvent::MoveSkill(skill_move));
-                //             }
-                //         }
-                //     }
-                //     _ => {}
-                // }
+                match mouse_input_mode {
+                    MouseInputMode::MoveItem(source, item) => {
+                        if let Some(hovered_element) = &hovered_element {
+                            if let Some(resource_move) = hovered_element.borrow_mut().drop_resource(PartialMove::Item { source, item }) {
+                                events.push(UserEvent::MoveResource(resource_move));
+                            }
+                        }
+                    }
+                    MouseInputMode::MoveSkill(source, skill) => {
+                        if let Some(hovered_element) = &hovered_element {
+                            if let Some(resource_move) = hovered_element.borrow_mut().drop_resource(PartialMove::Skill { source, skill }) {
+                                events.push(UserEvent::MoveResource(resource_move));
+                            }
+                        }
+                    }
+                    _ => {}
+                }
             }
         }