mirror of
https://github.com/csd4ni3l/aim-trainer.git
synced 2025-11-05 05:57:57 +01:00
Add controller UI support from-scratch
This commit is contained in:
csd4ni3l
@@ -1,20 +1,20 @@
|
||||
import json
|
||||
|
||||
from utils.constants import game_modes
|
||||
from utils.utils import FocusView
|
||||
|
||||
from ursina import *
|
||||
|
||||
class GameModeSelector:
|
||||
class GameModeSelector(FocusView):
|
||||
def __init__(self, rpc):
|
||||
super().__init__(model='cube', color=color.dark_gray, scale=(1.8, 1.2), z=1)
|
||||
|
||||
self.rpc = rpc
|
||||
rpc.update(state='In Game Mode Selector', details='Selecting Game Mode Selector', start=rpc.start_time)
|
||||
|
||||
self.data = json.load(open('settings.json'))
|
||||
|
||||
self.main = Entity(parent=camera.ui, model='cube', color=color.dark_gray, scale=(1.8, 1.2), z=1)
|
||||
self.back_button = Button('Back', parent=camera.ui, color=color.gray, scale=(.1, .05), position=(-.8, .45), on_click=self.exit)
|
||||
self.title_label = Text(text="Select a mode to play.", position=(-0.4, 0.425), scale=3)
|
||||
|
||||
self.ui = [self.main, self.back_button, self.title_label]
|
||||
|
||||
y = 0.2
|
||||
|
||||
for game_mode in game_modes:
|
||||
@@ -22,16 +22,15 @@ class GameModeSelector:
|
||||
self.ui.append(button)
|
||||
y -= 0.16
|
||||
|
||||
self.ui.extend([self.back_button, self.title_label, self.main])
|
||||
|
||||
self.detect_focusable_widgets()
|
||||
|
||||
def play(self, game_mode):
|
||||
self.hide()
|
||||
from game.game import Game
|
||||
Game(self.rpc, game_mode.lower())
|
||||
|
||||
def hide(self):
|
||||
for e in self.ui:
|
||||
destroy(e)
|
||||
self.ui.clear()
|
||||
|
||||
def exit(self):
|
||||
self.hide()
|
||||
from menus.main import Main
|
||||
|
||||
@@ -1,17 +1,14 @@
|
||||
from ursina import *
|
||||
|
||||
import pypresence, asyncio, json
|
||||
from utils.utils import FakePyPresence
|
||||
|
||||
from utils.utils import FakePyPresence, MenuButton, FocusView
|
||||
from utils.constants import discord_presence_id
|
||||
|
||||
class MenuButton(Button):
|
||||
def __init__(self, text='', **kwargs):
|
||||
super().__init__(text, scale=(.25, .075), highlight_color=color.azure, **kwargs)
|
||||
|
||||
for key, value in kwargs.items():
|
||||
setattr(self, key, value)
|
||||
|
||||
class Main():
|
||||
class Main(FocusView):
|
||||
def __init__(self, pypresence_client=None) -> None:
|
||||
super().__init__(y=.15)
|
||||
|
||||
self.pypresence_client = pypresence_client
|
||||
|
||||
with open("settings.json", "r") as file:
|
||||
@@ -56,14 +53,16 @@ class Main():
|
||||
|
||||
button_spacing = .075 * 1.25
|
||||
|
||||
self.menu_parent = Entity(parent=camera.ui, y=.15)
|
||||
self.main_menu = Entity(parent=self.menu_parent)
|
||||
self.title_label = Text("Aim Trainer", parent=self.main, y=-0.01 * button_spacing, scale=3, x=-.2)
|
||||
self.high_score_label = Text(f"High Score: {self.high_score}", parent=self.main, scale=1.25, y=-1 * button_spacing, x=-.12)
|
||||
|
||||
self.title_label = Text("Aim Trainer", parent=self.main_menu, y=-0.01 * button_spacing, scale=3, x=-.2)
|
||||
self.high_score_label = Text(f"High Score: {self.high_score}", parent=self.main_menu, scale=1.25, y=-1 * button_spacing, x=-.12)
|
||||
self.play_button = MenuButton('Play', on_click=Func(self.play), parent=self.main_menu, y=-2 * button_spacing)
|
||||
self.settings_button = MenuButton('Settings', on_click=Func(self.settings), parent=self.main_menu, y=-3 * button_spacing)
|
||||
self.quit_button = MenuButton('Quit', on_click=Sequence(Wait(.01), Func(application.quit)), parent=self.main_menu, y=-4 * button_spacing)
|
||||
self.play_button = MenuButton('Play', on_click=Func(self.play), parent=self.main, y=-2 * button_spacing)
|
||||
self.settings_button = MenuButton('Settings', on_click=Func(self.settings), parent=self.main, y=-3 * button_spacing)
|
||||
self.quit_button = MenuButton('Quit', on_click=Sequence(Wait(.01), Func(application.quit)), parent=self.main, y=-4 * button_spacing)
|
||||
|
||||
self.ui = [self.title_label, self.high_score_label, self.play_button, self.settings_button, self.quit_button]
|
||||
|
||||
self.detect_focusable_widgets()
|
||||
|
||||
def play(self):
|
||||
self.hide()
|
||||
@@ -74,10 +73,3 @@ class Main():
|
||||
self.hide()
|
||||
from menus.settings import Settings
|
||||
Settings(self.pypresence_client)
|
||||
|
||||
def hide(self):
|
||||
destroy(self.play_button)
|
||||
destroy(self.settings_button)
|
||||
destroy(self.quit_button)
|
||||
destroy(self.main_menu)
|
||||
destroy(self.menu_parent)
|
||||
|
||||
@@ -4,12 +4,15 @@ from ursina.prefabs.dropdown_menu import DropdownMenuButton
|
||||
from ursina.prefabs.button_group import ButtonGroup
|
||||
|
||||
import pypresence, json, copy
|
||||
from utils.utils import FakePyPresence, Dropdown, FileManager, is_float
|
||||
|
||||
from utils.utils import FakePyPresence, Dropdown, FileManager, FocusView, is_float
|
||||
from utils.constants import discord_presence_id, settings, settings_start_category
|
||||
from utils.preload import music_sound
|
||||
|
||||
class Settings:
|
||||
class Settings(FocusView):
|
||||
def __init__(self, rpc):
|
||||
super().__init__(model='cube', color=color.dark_gray, scale=(1.8, 1.2), z=1)
|
||||
|
||||
self.rpc = rpc
|
||||
rpc.update(state='In Settings', details='Modifying Settings', start=rpc.start_time)
|
||||
|
||||
@@ -17,15 +20,12 @@ class Settings:
|
||||
self.edits = {}
|
||||
self.category = settings_start_category
|
||||
|
||||
self.main = Entity(parent=camera.ui, model='cube', color=color.dark_gray, scale=(1.8, 1.2), z=1)
|
||||
|
||||
self.back_button = Button('Back', parent=camera.ui, color=color.gray, scale=(.1, .05), position=(-.8, .45), on_click=self.exit)
|
||||
self.ui = [self.main]
|
||||
|
||||
self.category_group = ButtonGroup(tuple(settings.keys()), default=self.category, spacing=(.25, 0, 0))
|
||||
self.category_group.on_value_changed = lambda: self.show(self.category_group.value)
|
||||
self.category_group.position = (-.6, .4)
|
||||
|
||||
self.ui = [self.main, self.back_button, self.category_group]
|
||||
self.ui.append(self.category_group)
|
||||
|
||||
self.weapon_dmg_inputs = {}
|
||||
self.weapon_atk_speed_inputs = {}
|
||||
@@ -39,8 +39,14 @@ class Settings:
|
||||
self.enemy_img_path_buttons = {}
|
||||
self.enemy_remove_buttons = {}
|
||||
|
||||
self.back_button = Button('Back', parent=camera.ui, color=color.gray, scale=(.1, .05), position=(-.8, .45), on_click=self.exit)
|
||||
|
||||
self.show(self.category)
|
||||
|
||||
self.ui.append(self.back_button)
|
||||
|
||||
self.detect_focusable_widgets()
|
||||
|
||||
def show(self, category):
|
||||
self.clear()
|
||||
self.category = category
|
||||
@@ -66,13 +72,13 @@ class Settings:
|
||||
if type == 'bool':
|
||||
bool_button_group = ButtonGroup(('OFF', 'ON'), default='ON' if val else 'OFF', spacing=(.1, 0, 0))
|
||||
bool_button_group.position = (.2, y)
|
||||
bool_button_group.on_value_changed = lambda bool_button_group=bool_button_group, n=name: self.update(n, bool_button_group.value == 'ON')
|
||||
bool_button_group.on_value_changed = lambda bool_button_group=bool_button_group, n=name: self.update_settings(n, bool_button_group.value == 'ON')
|
||||
self.ui.append(bool_button_group)
|
||||
|
||||
elif type == 'slider':
|
||||
slider = ThinSlider(text=name, min=info['min'], max=info['max'], default=val, dynamic=True)
|
||||
slider = ThinSlider(min=info['min'], max=info['max'], default=val, dynamic=True)
|
||||
slider.position = (.2, y)
|
||||
slider.on_value_changed = lambda slider=slider, n=name: self.update(n, int(slider.value))
|
||||
slider.on_value_changed = lambda slider=slider, n=name: self.update_settings(n, int(slider.value))
|
||||
self.ui.append(slider)
|
||||
|
||||
elif type == "option":
|
||||
@@ -100,10 +106,12 @@ class Settings:
|
||||
self.apply_button = Button('Apply', parent=camera.ui, color=color.green, scale=(.15, .08), position=(.6, -.4), on_click=self.apply_changes)
|
||||
self.ui.append(self.apply_button)
|
||||
|
||||
self.detect_focusable_widgets()
|
||||
|
||||
def directory_selected(self, btn, name, value):
|
||||
btn.text = f"Select Directory ({value})"
|
||||
|
||||
self.update(name, value)
|
||||
self.update_settings(name, value)
|
||||
|
||||
def select_directory(self, btn, name):
|
||||
self.dir_file_manager = FileManager(return_folders=True, z=-1)
|
||||
@@ -123,9 +131,9 @@ class Settings:
|
||||
def dropdown_update(self, n, dropdown_menu, btn):
|
||||
dropdown_menu.text = btn.text
|
||||
|
||||
self.update(n, btn.text)
|
||||
self.update_settings(n, btn.text)
|
||||
|
||||
def update(self, name, value):
|
||||
def update_settings(self, name, value):
|
||||
self.edits[settings[self.category][name]['config_key']] = value
|
||||
|
||||
def apply_changes(self):
|
||||
@@ -255,6 +263,8 @@ class Settings:
|
||||
self.apply_button = Button('Apply', parent=camera.ui, color=color.green, scale=(.15, .08), position=(.6, -.4), on_click=self.apply_changes)
|
||||
self.ui.append(self.apply_button)
|
||||
|
||||
self.detect_focusable_widgets()
|
||||
|
||||
def weapons(self):
|
||||
y = .3
|
||||
|
||||
@@ -295,16 +305,15 @@ class Settings:
|
||||
self.apply_button = Button('Apply', parent=camera.ui, color=color.green, scale=(.15, .08), position=(.6, -.4), on_click=self.apply_changes)
|
||||
self.ui.append(self.apply_button)
|
||||
|
||||
self.detect_focusable_widgets()
|
||||
|
||||
def clear(self):
|
||||
for e in list(self.ui):
|
||||
if e not in (self.main, self.back_button, self.category_group):
|
||||
destroy(e)
|
||||
self.ui.remove(e)
|
||||
|
||||
def hide(self):
|
||||
for e in self.ui:
|
||||
destroy(e)
|
||||
self.ui.clear()
|
||||
self.detect_focusable_widgets()
|
||||
|
||||
def exit(self):
|
||||
self.hide()
|
||||
@@ -340,3 +349,5 @@ class Settings:
|
||||
self.credits_label = Text(text=text, parent=camera.ui, position=(0, 0), origin=(0, 0), scale=font_size, color=color.white)
|
||||
self.credits_label.type = 'credits_text'
|
||||
self.ui.append(self.credits_label)
|
||||
|
||||
self.detect_focusable_widgets()
|
||||
106
utils/utils.py
106
utils/utils.py
@@ -1,5 +1,5 @@
|
||||
from panda3d.core import GraphicsPipeSelection
|
||||
from ursina.prefabs.dropdown_menu import DropdownMenu
|
||||
from ursina.prefabs.dropdown_menu import DropdownMenu, DropdownMenuButton
|
||||
from ursina.prefabs.file_browser import FileBrowser
|
||||
from ursina.prefabs.first_person_controller import FirstPersonController
|
||||
from ursina import *
|
||||
@@ -34,10 +34,12 @@ class Dropdown(DropdownMenu):
|
||||
|
||||
self.scale = (.4,.04)
|
||||
|
||||
|
||||
def on_mouse_enter(self):
|
||||
...
|
||||
|
||||
def update(self):
|
||||
...
|
||||
|
||||
def input(self, key):
|
||||
super().input(key)
|
||||
|
||||
@@ -80,6 +82,106 @@ def is_float(string):
|
||||
except ValueError:
|
||||
return False
|
||||
|
||||
class MenuButton(Button):
|
||||
def __init__(self, text='', **kwargs):
|
||||
super().__init__(text, scale=(.25, .075), highlight_color=color.azure, **kwargs)
|
||||
|
||||
for key, value in kwargs.items():
|
||||
setattr(self, key, value)
|
||||
|
||||
class FocusView():
|
||||
def __init__(self, **kwargs):
|
||||
self.ui = []
|
||||
self.focusable_widgets = []
|
||||
self.button_group_buttons = {}
|
||||
self.focused_index = -1
|
||||
|
||||
self.main = Entity(parent=camera.ui, **kwargs)
|
||||
self.main.update = self.update
|
||||
self.main.input = self.input
|
||||
self.previously_focused_index = -1
|
||||
|
||||
def detect_focusable_widgets(self):
|
||||
self.focusable_widgets = []
|
||||
self.button_group_buttons = {}
|
||||
|
||||
n = 0
|
||||
|
||||
for entity in self.ui:
|
||||
if isinstance(entity, (MenuButton, Dropdown, Button, InputField, DropdownMenuButton)):
|
||||
self.focusable_widgets.append(entity)
|
||||
n += 1
|
||||
elif isinstance(entity, ButtonGroup):
|
||||
for button in entity.buttons:
|
||||
self.focusable_widgets.append(button)
|
||||
self.button_group_buttons[n] = entity
|
||||
n += 1
|
||||
|
||||
def update(self):
|
||||
if self.focused_index != self.previously_focused_index:
|
||||
self.focusable_widgets[self.previously_focused_index].model.setColorScale(self.focusable_widgets[self.previously_focused_index].color) # reset previous focus
|
||||
|
||||
try:
|
||||
self.focusable_widgets[self.focused_index].model.setColorScale(self.focusable_widgets[self.focused_index].highlight_color) # create new focus
|
||||
self.previously_focused_index = self.focused_index # keep previous focused index
|
||||
except:
|
||||
pass
|
||||
|
||||
def input(self, key):
|
||||
if key == "gamepad dpad down" or key == "gamepad dpad right":
|
||||
self.focused_index += 1
|
||||
if self.focused_index > len(self.focusable_widgets) - 1:
|
||||
self.focused_index = 0
|
||||
|
||||
elif key == "gamepad dpad up" or key == "gamepad dpad left":
|
||||
self.focused_index -= 1
|
||||
if self.focused_index < 0:
|
||||
self.focused_index = len(self.focusable_widgets) - 1
|
||||
|
||||
elif key == "gamepad a":
|
||||
if self.focused_index < 0:
|
||||
self.focused_index = 0
|
||||
|
||||
focused_widget = self.focusable_widgets[self.focused_index]
|
||||
|
||||
focused_widget.model.setColorScale(focused_widget.pressed_color)
|
||||
focused_widget.model.setScale(Vec3(focused_widget.pressed_scale, focused_widget.pressed_scale, 1))
|
||||
if focused_widget.pressed_sound:
|
||||
if isinstance(focused_widget.pressed_sound, Audio):
|
||||
focused_widget.pressed_sound.play()
|
||||
elif isinstance(focused_widget.pressed_sound, str):
|
||||
Audio(focused_widget.pressed_sound, auto_destroy=True)
|
||||
|
||||
if isinstance(focused_widget, Dropdown):
|
||||
if not focused_widget.buttons[0].enabled:
|
||||
focused_widget.open()
|
||||
else:
|
||||
focused_widget.close()
|
||||
|
||||
elif self.focused_index in self.button_group_buttons:
|
||||
button_group = self.button_group_buttons[self.focused_index]
|
||||
button_group.select(self.focusable_widgets[self.focused_index])
|
||||
else:
|
||||
if focused_widget.on_click:
|
||||
focused_widget.on_click()
|
||||
|
||||
elif key == "gamepad a up":
|
||||
if self.focused_index < 0:
|
||||
self.focused_index = 0
|
||||
|
||||
focused_widget = self.focusable_widgets[self.focused_index]
|
||||
|
||||
focused_widget.model.setColorScale(focused_widget.highlight_color)
|
||||
focused_widget.model.setScale(Vec3(focused_widget.highlight_scale, focused_widget.highlight_scale, 1))
|
||||
|
||||
def hide(self):
|
||||
for entity in self.ui:
|
||||
destroy(entity)
|
||||
|
||||
self.ui.clear()
|
||||
|
||||
destroy(self.main)
|
||||
|
||||
class FixedFirstPersonController(FirstPersonController):
|
||||
def update(self):
|
||||
self.rotation_y += mouse.velocity[0] * self.mouse_sensitivity[1]
|
||||
|
||||
Reference in New Issue
Block a user