From 843660dfcee2b82cb056d59e5d6fc268b0518abe Mon Sep 17 00:00:00 2001 From: dingo Date: Wed, 25 Mar 2026 16:11:02 -0400 Subject: [PATCH] Implement cubemap skybox, multi-active skyboxes, and 2D scene backgrounds - Server: Add SkyboxType + 6 CubeUrl fields to SkyboxDefinition entity - Server: EF migration AddSkyboxCubemapType - Server: GetSkyboxConfigResponse now returns array of all active skyboxes - Admin: SkyboxManagerPage supports Panoramic/AnimatedPanorama/Cubemap types, 6 face URL fields for cubemap, and independent per-skybox active toggle - Client: ContentCache fetches + caches skyboxes; adds get_random_skybox, get_skybox_bg_url, load_texture_async, apply_scene_background helpers - Client: game_screen replaces _fetch_skybox with ContentCache-based approach; adds _load_cubemap_skybox / _apply_cubemap_images / _apply_cubemap_material - Client: 12 2D scene scripts call ContentCache.apply_scene_background(self) in _ready() to replace solid-color backgrounds with CDN skybox images Generated with [Claude Code](https://claude.ai/code) via [Happy](https://happy.engineering) Co-Authored-By: Claude Co-Authored-By: Happy --- .../origin-client/autoloads/ContentCache.gd | 117 ++++ .../scenes/account/account_screen.gd | 5 +- .../scenes/bazaar/bazaar_screen.gd | 1 + .../scenes/collection/collection_screen.gd | 1 + .../scenes/free_play/free_play_screen.gd | 1 + .../scenes/free_play/lobby_room_screen.gd | 3 +- .../origin-client/scenes/game/game_screen.gd | 101 ++- .../origin-client/scenes/init/init_screen.gd | 1 + .../scenes/leaderboard/leaderboard_screen.gd | 1 + .../scenes/login/login_screen.gd | 1 + .../origin-client/scenes/main/main_screen.gd | 1 + .../scenes/matchmaking/matchmaking_screen.gd | 1 + .../scenes/settings/settings_screen.gd | 1 + .../starter_deck/starter_deck_screen.gd | 1 + .../Pages/Content/SkyboxManagerPage.razor | 249 ++++++-- Server/src/SOR.Content/ContentMessages.cs | 32 +- .../Handlers/ContentGetSkyboxConfigHandler.cs | 15 +- .../SOR.Database/Contexts/CatalogDbContext.cs | 7 + .../Entities/Catalog/SkyboxDefinition.cs | 35 +- ...325201027_AddSkyboxCubemapType.Designer.cs | 604 ++++++++++++++++++ .../20260325201027_AddSkyboxCubemapType.cs | 102 +++ .../Catalog/CatalogDbContextModelSnapshot.cs | 28 + 22 files changed, 1184 insertions(+), 124 deletions(-) create mode 100644 Server/src/SOR.Database/Migrations/Catalog/20260325201027_AddSkyboxCubemapType.Designer.cs create mode 100644 Server/src/SOR.Database/Migrations/Catalog/20260325201027_AddSkyboxCubemapType.cs diff --git a/Client/origin-client/autoloads/ContentCache.gd b/Client/origin-client/autoloads/ContentCache.gd index 939e3fe..2036462 100644 --- a/Client/origin-client/autoloads/ContentCache.gd +++ b/Client/origin-client/autoloads/ContentCache.gd @@ -21,6 +21,7 @@ const CACHE_DIR := "user://content" const CACHE_PATH := "user://content/defs.json" const TILE_MODELS_PATH := "user://content/tile_models.json" const TILE_BOTTOMS_PATH := "user://content/tile_bottoms.json" +const SKYBOXES_PATH := "user://content/skyboxes.json" const PAGE_SIZE := 200 const REFRESH_INTERVAL_SECS := 300.0 # re-sync every 5 minutes during live play @@ -42,12 +43,16 @@ var _tile_textures: Dictionary = {} ## Array of CDN URL strings for tile bottom (stalagmite) models. var _tile_bottom_urls: Array = [] +## Array of Dictionary (SkyboxDefinitionDto) for all active skyboxes. +var _skyboxes: Array = [] + # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: _load_from_disk() _load_tile_models_from_disk() _load_tile_bottoms_from_disk() + _load_skyboxes_from_disk() # ── Public API ──────────────────────────────────────────────────────────────── @@ -91,6 +96,7 @@ func start_sync() -> void: _fetch_page(_sync_version) fetch_tile_models() fetch_tile_bottoms() + fetch_skyboxes() ## Return the GLB animation track name for a card action. @@ -141,6 +147,87 @@ func fetch_tile_bottoms() -> void: ) +## Fetch active skybox definitions from the server and update the local cache. +func fetch_skyboxes() -> void: + Network.request( + "content.get_skybox_config", + {}, + func(_type: String, p: Variant): _on_skyboxes(p), + func(code: String, msg: String): + push_warning("ContentCache: skyboxes fetch failed — %s %s" % [code, msg]) + ) + + +## Returns a random active skybox Dictionary, or {} if none are cached. +func get_random_skybox() -> Dictionary: + if _skyboxes.is_empty(): + return {} + return _skyboxes[randi() % _skyboxes.size()] as Dictionary + + +## Returns the best URL to use as a flat 2D background from this skybox dict. +## For Cubemap: returns the +Z (Front) face URL. +## For Panoramic/AnimatedPanorama: returns the cdnPath. +func get_skybox_bg_url(skybox: Dictionary) -> String: + var sky_type := str(skybox.get("type", "Panoramic")) + if sky_type == "Cubemap": + return str(skybox.get("cubePzUrl", "")) + return str(skybox.get("cdnPath", "")) + + +## Downloads an image from url and calls callback(Texture2D). +## Adds a temporary HTTPRequest child; frees itself on completion. +func load_texture_async(url: String, callback: Callable) -> void: + var http := HTTPRequest.new() + add_child(http) + http.request_completed.connect(func(result: int, code: int, _hdrs: PackedStringArray, body: PackedByteArray): + http.queue_free() + if result != HTTPRequest.RESULT_SUCCESS or code != 200: + callback.call(null) + return + var img := Image.new() + var ext := url.split("?")[0].get_extension().to_lower() + var err: Error + if ext in ["jpg", "jpeg"]: + err = img.load_jpg_from_buffer(body) + elif ext == "webp": + err = img.load_webp_from_buffer(body) + else: + err = img.load_png_from_buffer(body) + if err != OK: + callback.call(null) + return + callback.call(ImageTexture.create_from_image(img))) + http.request(url) + + +## Hides the first direct-child ColorRect of `parent` and injects a full-rect +## TextureRect (from a random active skybox) as the new first child. +## Call from _ready() in any 2D scene that has a solid-color background. +func apply_scene_background(parent: Control) -> void: + var skybox := get_random_skybox() + if skybox.is_empty(): + return + var url := get_skybox_bg_url(skybox) + if url.is_empty(): + return + load_texture_async(url, func(tex: Texture2D): + if not is_instance_valid(parent) or tex == null: + return + for child in parent.get_children(): + if child is ColorRect: + child.visible = false + break + var tr := TextureRect.new() + tr.texture = tex + tr.expand_mode = TextureRect.EXPAND_IGNORE_SIZE + tr.stretch_mode = TextureRect.STRETCH_KEEP_ASPECT_COVERED + tr.set_anchors_and_offsets_preset(Control.PRESET_FULL_RECT) + tr.mouse_filter = Control.MOUSE_FILTER_IGNORE + parent.add_child(tr) + parent.move_child(tr, 0)) + + ## Fetch tile model bindings from the server and update the local cache. ## Emits tile_models_ready when done (even on error, using cached data). func fetch_tile_models() -> void: @@ -226,6 +313,15 @@ func _on_tile_bottoms(payload: Variant) -> void: _tile_bottom_urls.append(u as String) _save_tile_bottoms_to_disk() + +func _on_skyboxes(payload: Variant) -> void: + var p := payload as Dictionary + _skyboxes.clear() + for item in p.get("skyboxes", []): + if typeof(item) == TYPE_DICTIONARY: + _skyboxes.append(item as Dictionary) + _save_skyboxes_to_disk() + # ── Persistence ─────────────────────────────────────────────────────────────── func _load_from_disk() -> void: @@ -298,3 +394,24 @@ func _save_tile_bottoms_to_disk() -> void: return file.store_string(JSON.stringify(_tile_bottom_urls)) file.close() + + +func _load_skyboxes_from_disk() -> void: + if not FileAccess.file_exists(SKYBOXES_PATH): + return + var file := FileAccess.open(SKYBOXES_PATH, FileAccess.READ) + if not file: + return + var parsed: Variant = JSON.parse_string(file.get_as_text()) + file.close() + if typeof(parsed) == TYPE_ARRAY: + _skyboxes = parsed as Array + + +func _save_skyboxes_to_disk() -> void: + DirAccess.make_dir_recursive_absolute(CACHE_DIR) + var file := FileAccess.open(SKYBOXES_PATH, FileAccess.WRITE) + if not file: + return + file.store_string(JSON.stringify(_skyboxes)) + file.close() diff --git a/Client/origin-client/scenes/account/account_screen.gd b/Client/origin-client/scenes/account/account_screen.gd index a27202f..97ded96 100644 --- a/Client/origin-client/scenes/account/account_screen.gd +++ b/Client/origin-client/scenes/account/account_screen.gd @@ -14,6 +14,7 @@ const NOTIF_ROW = preload("res://scenes/account/components/NotificationRow.tscn" # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: + ContentCache.apply_scene_background(self) back_btn.pressed.connect(_on_back) _load_profile() _load_notifications() @@ -207,7 +208,7 @@ func _show_notification_dialog(notification: Dictionary, focus_reply: bool) -> v func _extract_bug_report_payload(notification: Dictionary) -> Dictionary: - var payload_raw := notification.get("payloadJson", null) + var payload_raw : String = notification.get("payloadJson", null) if payload_raw == null: return {} @@ -215,7 +216,7 @@ func _extract_bug_report_payload(notification: Dictionary) -> Dictionary: if payload_text.is_empty(): return {} - var parsed := JSON.parse_string(payload_text) + var parsed : Variant = JSON.parse_string(payload_text) if typeof(parsed) == TYPE_DICTIONARY: return parsed as Dictionary return {} diff --git a/Client/origin-client/scenes/bazaar/bazaar_screen.gd b/Client/origin-client/scenes/bazaar/bazaar_screen.gd index 63e0da9..7473af6 100644 --- a/Client/origin-client/scenes/bazaar/bazaar_screen.gd +++ b/Client/origin-client/scenes/bazaar/bazaar_screen.gd @@ -65,6 +65,7 @@ var _type_filter : String = "" # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: + ContentCache.apply_scene_background(self) back_btn.pressed.connect(_on_back) boosters_tab_btn.pressed.connect(func(): _switch_tab(Tab.BOOSTERS)) decks_tab_btn.pressed.connect(func(): _switch_tab(Tab.DECKS)) diff --git a/Client/origin-client/scenes/collection/collection_screen.gd b/Client/origin-client/scenes/collection/collection_screen.gd index f85cb2d..d54f37e 100644 --- a/Client/origin-client/scenes/collection/collection_screen.gd +++ b/Client/origin-client/scenes/collection/collection_screen.gd @@ -22,6 +22,7 @@ var _card_popup: Control = null # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: + ContentCache.apply_scene_background(self) back_btn.pressed.connect(_on_back) cards_tab_btn.pressed.connect(func(): _show_tab(0)) decks_tab_btn.pressed.connect(func(): _show_tab(1)) diff --git a/Client/origin-client/scenes/free_play/free_play_screen.gd b/Client/origin-client/scenes/free_play/free_play_screen.gd index 50b8989..00338af 100644 --- a/Client/origin-client/scenes/free_play/free_play_screen.gd +++ b/Client/origin-client/scenes/free_play/free_play_screen.gd @@ -36,6 +36,7 @@ var _deck_btn_group : ButtonGroup = null # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: + ContentCache.apply_scene_background(self) Chat.set_bubble_visible(true) _setup_ui() _load_decks() # load decks first; lobbies load after decks arrive diff --git a/Client/origin-client/scenes/free_play/lobby_room_screen.gd b/Client/origin-client/scenes/free_play/lobby_room_screen.gd index ac8249b..deb7ca2 100644 --- a/Client/origin-client/scenes/free_play/lobby_room_screen.gd +++ b/Client/origin-client/scenes/free_play/lobby_room_screen.gd @@ -49,6 +49,7 @@ var _current_rules : Dictionary = {} # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: + ContentCache.apply_scene_background(self) _setup_ui() _connect_signals() _refresh_display() @@ -139,7 +140,7 @@ func _refresh_display() -> void: lobby_title_label.text = "LOBBY: %s" % lobby_name # Host slot - host_name_label.text = "Host: %s" % str(lobby.get("hostDisplayName", Auth.user_id)) + host_name_label.text = "Host: %s" % str(lobby.get("hostDisplayName", Auth.display_name)) host_deck_label.text = "Deck: (selected)" # Guest slot diff --git a/Client/origin-client/scenes/game/game_screen.gd b/Client/origin-client/scenes/game/game_screen.gd index 1139828..06113db 100644 --- a/Client/origin-client/scenes/game/game_screen.gd +++ b/Client/origin-client/scenes/game/game_screen.gd @@ -340,7 +340,7 @@ func _setup_environment() -> void: _setup_live_skybox(env) "cdn": _setup_procedural_sky(env) - _fetch_skybox() + _apply_skybox_from_cache() _: # "off" or any unknown value _setup_procedural_sky(env) @@ -410,7 +410,7 @@ func _on_skybox_setting_changed() -> void: _setup_live_skybox(env) "cdn": _setup_procedural_sky() - _fetch_skybox() + _apply_skybox_from_cache() _: _setup_procedural_sky() @@ -517,30 +517,79 @@ func _clear_stars() -> void: # ── CDN skybox helpers ───────────────────────────────────────────────────────── -func _fetch_skybox() -> void: - Network.request("content.get_skybox_config", {}, - func(_type: String, resp: Variant) -> void: - var d := resp as Dictionary - # Use a Variant to safely detect null before treating as Dictionary. - var skybox_raw : Variant = d.get("skybox", null) - if skybox_raw == null or not skybox_raw is Dictionary: - print("[GameScreen] No active skybox configured — keeping procedural sky.") - return - var skybox := skybox_raw as Dictionary - var cdn_path : String = str(skybox.get("cdnPath", "")) - var is_animated : bool = bool(skybox.get("isAnimated", false)) - var frame_count : int = int(skybox.get("frameCount", 1)) - var fps : float = float(skybox.get("fps", 24.0)) - if cdn_path.is_empty(): - push_warning("[GameScreen] Skybox has empty cdnPath — skipping.") - return - print("[GameScreen] Loading CDN skybox: animated=%s url=%s" % [is_animated, cdn_path]) - if is_animated: - _load_animated_skybox(cdn_path, frame_count, fps) - else: - _load_static_skybox(cdn_path), - func(code: String, msg: String) -> void: - push_warning("[GameScreen] Skybox fetch failed — %s: %s" % [code, msg])) +func _apply_skybox_from_cache() -> void: + var skybox := ContentCache.get_random_skybox() + if skybox.is_empty(): + print("[GameScreen] No active skybox — keeping procedural sky.") + return + var sky_type := str(skybox.get("type", "Panoramic")) + print("[GameScreen] Applying skybox type=%s" % sky_type) + if sky_type == "Cubemap": + _load_cubemap_skybox(skybox) + elif bool(skybox.get("isAnimated", false)) or sky_type == "AnimatedPanorama": + _load_animated_skybox( + str(skybox.get("cdnPath", "")), + int(skybox.get("frameCount", 1)), + float(skybox.get("fps", 24.0))) + else: + _load_static_skybox(str(skybox.get("cdnPath", ""))) + +func _load_cubemap_skybox(skybox: Dictionary) -> void: + # Face order for Godot 4 Cubemap.create_from_images(): + # index 0=+X(Right) 1=-X(Left) 2=+Y(Top) 3=-Y(Bottom) 4=+Z(Front) 5=-Z(Back) + var urls := [ + str(skybox.get("cubePxUrl", "")), + str(skybox.get("cubeNxUrl", "")), + str(skybox.get("cubePyUrl", "")), + str(skybox.get("cubeNyUrl", "")), + str(skybox.get("cubePzUrl", "")), + str(skybox.get("cubeNzUrl", "")), + ] + var images: Array = [] + images.resize(6) + var pending := 6 + for i in 6: + var idx := i + var url := urls[idx] + if url.is_empty(): + images[idx] = null + pending -= 1 + if pending == 0: + _apply_cubemap_images(images) + continue + ContentCache.load_texture_async(url, func(tex: Texture2D): + images[idx] = tex.get_image() if tex != null else null + pending -= 1 + if pending == 0: + _apply_cubemap_images.call_deferred(images)) + +func _apply_cubemap_images(images: Array) -> void: + for i in 6: + if images[i] == null: + var img := Image.create(1, 1, false, Image.FORMAT_RGB8) + img.fill(Color.BLACK) + images[i] = img + else: + (images[i] as Image).convert(Image.FORMAT_RGB8) + var cubemap := Cubemap.new() + cubemap.create_from_images(images) + _apply_cubemap_material(cubemap) + +func _apply_cubemap_material(cubemap: Cubemap) -> void: + var shader := Shader.new() + shader.code = """ +shader_type sky; +uniform samplerCube environment : filter_linear, repeat_disable; +void sky() { COLOR = texture(environment, EYEDIR).rgb; } +""" + var mat := ShaderMaterial.new() + mat.shader = shader + mat.set_shader_parameter("environment", cubemap) + var sky := Sky.new() + sky.sky_material = mat + $WorldEnvironment.environment.sky = sky + $WorldEnvironment.environment.background_mode = Environment.BG_SKY + print("[GameScreen] Cubemap sky applied.") func _load_static_skybox(url: String) -> void: var http := HTTPRequest.new() diff --git a/Client/origin-client/scenes/init/init_screen.gd b/Client/origin-client/scenes/init/init_screen.gd index 2e4e110..eeb4cb7 100644 --- a/Client/origin-client/scenes/init/init_screen.gd +++ b/Client/origin-client/scenes/init/init_screen.gd @@ -33,6 +33,7 @@ var _pulse_tween : Tween = null # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: + ContentCache.apply_scene_background(self) update_panel.visible = false retry_btn.visible = false progress_bar.value = 0.0 diff --git a/Client/origin-client/scenes/leaderboard/leaderboard_screen.gd b/Client/origin-client/scenes/leaderboard/leaderboard_screen.gd index 6e77695..a60c1c5 100644 --- a/Client/origin-client/scenes/leaderboard/leaderboard_screen.gd +++ b/Client/origin-client/scenes/leaderboard/leaderboard_screen.gd @@ -19,6 +19,7 @@ var _page_count : int = 1 # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: + ContentCache.apply_scene_background(self) back_btn.pressed.connect(_on_back) prev_btn.pressed.connect(func(): _go_page(_page - 1)) next_btn.pressed.connect(func(): _go_page(_page + 1)) diff --git a/Client/origin-client/scenes/login/login_screen.gd b/Client/origin-client/scenes/login/login_screen.gd index cca396b..47e7227 100644 --- a/Client/origin-client/scenes/login/login_screen.gd +++ b/Client/origin-client/scenes/login/login_screen.gd @@ -42,6 +42,7 @@ var _pending_pass := "" # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: + ContentCache.apply_scene_background(self) # If already authenticated (e.g. scene reloaded), skip straight to main. # Use call_deferred so the scene tree is not modified while _ready() is running. if not Auth.user_id.is_empty(): diff --git a/Client/origin-client/scenes/main/main_screen.gd b/Client/origin-client/scenes/main/main_screen.gd index e9a1604..8b53836 100644 --- a/Client/origin-client/scenes/main/main_screen.gd +++ b/Client/origin-client/scenes/main/main_screen.gd @@ -20,6 +20,7 @@ extends Control # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: + ContentCache.apply_scene_background(self) welcome_label.text = "Welcome, %s!" % Auth.display_name Chat.set_bubble_visible(true) diff --git a/Client/origin-client/scenes/matchmaking/matchmaking_screen.gd b/Client/origin-client/scenes/matchmaking/matchmaking_screen.gd index 334948d..3e15c8c 100644 --- a/Client/origin-client/scenes/matchmaking/matchmaking_screen.gd +++ b/Client/origin-client/scenes/matchmaking/matchmaking_screen.gd @@ -25,6 +25,7 @@ var _searching : bool = false # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: + ContentCache.apply_scene_background(self) cancel_btn.pressed.connect(_on_cancel) Game.match_found.connect(_on_match_found) _show_deck_panel() diff --git a/Client/origin-client/scenes/settings/settings_screen.gd b/Client/origin-client/scenes/settings/settings_screen.gd index 27d9a73..9ccd3b6 100644 --- a/Client/origin-client/scenes/settings/settings_screen.gd +++ b/Client/origin-client/scenes/settings/settings_screen.gd @@ -15,6 +15,7 @@ const _HI_LABELS: Array = ["Movement", "Attack", "Ability", "Terramorpha", "Sele # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: + ContentCache.apply_scene_background(self) # Populate controls from current settings (no signal spam). music_slider.set_value_no_signal(Settings.music_volume) music_mute_btn.set_pressed_no_signal(Settings.music_muted) diff --git a/Client/origin-client/scenes/starter_deck/starter_deck_screen.gd b/Client/origin-client/scenes/starter_deck/starter_deck_screen.gd index 4b685a4..90edf0c 100644 --- a/Client/origin-client/scenes/starter_deck/starter_deck_screen.gd +++ b/Client/origin-client/scenes/starter_deck/starter_deck_screen.gd @@ -23,6 +23,7 @@ var _confirming: bool = false # ── Lifecycle ───────────────────────────────────────────────────────────────── func _ready() -> void: + ContentCache.apply_scene_background(self) confirm_btn.disabled = true confirm_btn.pressed.connect(_on_confirm_pressed) _fetch_decks() diff --git a/Server/src/SOR.Admin/Components/Pages/Content/SkyboxManagerPage.razor b/Server/src/SOR.Admin/Components/Pages/Content/SkyboxManagerPage.razor index 8fe31f2..674a4e1 100644 --- a/Server/src/SOR.Admin/Components/Pages/Content/SkyboxManagerPage.razor +++ b/Server/src/SOR.Admin/Components/Pages/Content/SkyboxManagerPage.razor @@ -12,7 +12,17 @@

Skyboxes

Configure 3D environment skyboxes displayed in gameplay scenes. - Only the active skybox is sent to clients. + @{ + var activeCount = _skyboxes.Count(s => s.IsActive); + } + @if (activeCount == 0) + { + No active skyboxes — clients use the procedural sky. + } + else + { + @activeCount active skybox@(activeCount == 1 ? "" : "es") — client picks one randomly per session. + }
-
- Static: Set CDN path to a single panoramic/equirectangular image (PNG/JPG recommended).
- Animated: Upload frames as /0.png, /1.png, … /{FrameCount-1}.png - inside the base folder, then set CDN path to that folder URL. + @if (_newSkyboxType == "Cubemap") + { +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ } +
+ Panoramic: Set CDN path to a single equirectangular image (PNG/JPG recommended).
+ Animated Panorama: Upload frames as /0.png, /1.png, … /{FrameCount-1}.png + inside the base folder, then set CDN path to that folder URL.
+ Cubemap: Supply six face images (+X/-X/+Y/-Y/+Z/-Z). The +Z (Front) face also appears as the 2D background in non-game scenes.
@@ -187,11 +268,17 @@ private string? _message; private bool _isError; - private string _newName = ""; - private bool _newIsAnimated = false; - private string _newCdnPath = ""; - private int _newFrameCount = 1; - private float _newFps = 24f; + private string _newName = ""; + private string _newSkyboxType = "Panoramic"; + private string _newCdnPath = ""; + private int _newFrameCount = 1; + private float _newFps = 24f; + private string _newCubePxUrl = ""; + private string _newCubeNxUrl = ""; + private string _newCubePyUrl = ""; + private string _newCubeNyUrl = ""; + private string _newCubePzUrl = ""; + private string _newCubeNzUrl = ""; protected override async Task OnInitializedAsync() => await LoadAsync(); @@ -202,9 +289,19 @@ _loading = false; } + private bool IsAddDisabled() + { + if (string.IsNullOrWhiteSpace(_newName)) return true; + if (_newSkyboxType == "Cubemap") return false; // face URLs are optional individually + return string.IsNullOrWhiteSpace(_newCdnPath); + } + private async Task SaveAsync(SkyboxDefinition skybox) { - if (!skybox.IsAnimated) { skybox.FrameCount = 1; skybox.Fps = 0f; } + var type = skybox.SkyboxType ?? "Panoramic"; + if (type != "AnimatedPanorama") { skybox.FrameCount = 1; skybox.Fps = 0f; } + // Keep IsAnimated in sync with SkyboxType for backward compat + skybox.IsAnimated = type == "AnimatedPanorama"; try { await Db.SaveChangesAsync(); @@ -220,14 +317,11 @@ private async Task SetActiveAsync(SkyboxDefinition skybox) { - // Deactivate all, then activate the chosen one. - foreach (var s in _skyboxes) - s.IsActive = false; skybox.IsActive = true; try { await Db.SaveChangesAsync(); - _message = $"\"{skybox.Name}\" is now the active skybox."; + _message = $"\"{skybox.Name}\" is now active."; _isError = false; } catch (Exception ex) @@ -243,7 +337,7 @@ try { await Db.SaveChangesAsync(); - _message = $"\"{skybox.Name}\" deactivated. No skybox is now active (clients use procedural sky)."; + _message = $"\"{skybox.Name}\" deactivated."; _isError = false; } catch (Exception ex) @@ -272,14 +366,23 @@ private async Task AddAsync() { + var isCubemap = _newSkyboxType == "Cubemap"; + var isAnimated = _newSkyboxType == "AnimatedPanorama"; var s = new SkyboxDefinition { Id = Guid.NewGuid(), Name = _newName.Trim(), - IsAnimated = _newIsAnimated, - CdnPath = _newCdnPath.Trim(), - FrameCount = _newIsAnimated ? Math.Max(1, _newFrameCount) : 1, - Fps = _newIsAnimated ? Math.Max(1f, _newFps) : 0f, + SkyboxType = _newSkyboxType, + IsAnimated = isAnimated, + CdnPath = isCubemap ? "" : _newCdnPath.Trim(), + FrameCount = isAnimated ? Math.Max(1, _newFrameCount) : 1, + Fps = isAnimated ? Math.Max(1f, _newFps) : 0f, + CubePxUrl = isCubemap ? NullIfEmpty(_newCubePxUrl) : null, + CubeNxUrl = isCubemap ? NullIfEmpty(_newCubeNxUrl) : null, + CubePyUrl = isCubemap ? NullIfEmpty(_newCubePyUrl) : null, + CubeNyUrl = isCubemap ? NullIfEmpty(_newCubeNyUrl) : null, + CubePzUrl = isCubemap ? NullIfEmpty(_newCubePzUrl) : null, + CubeNzUrl = isCubemap ? NullIfEmpty(_newCubeNzUrl) : null, IsActive = false, CreatedAt = DateTimeOffset.UtcNow, }; @@ -289,9 +392,10 @@ await Db.SaveChangesAsync(); _skyboxes.Add(s); _newName = _newCdnPath = ""; - _newIsAnimated = false; + _newSkyboxType = "Panoramic"; _newFrameCount = 1; _newFps = 24f; + _newCubePxUrl = _newCubeNxUrl = _newCubePyUrl = _newCubeNyUrl = _newCubePzUrl = _newCubeNzUrl = ""; _message = $"Skybox \"{s.Name}\" added."; _isError = false; } @@ -301,4 +405,7 @@ _isError = true; } } + + private static string? NullIfEmpty(string s) => + string.IsNullOrWhiteSpace(s) ? null : s.Trim(); } diff --git a/Server/src/SOR.Content/ContentMessages.cs b/Server/src/SOR.Content/ContentMessages.cs index 57d9744..028adef 100644 --- a/Server/src/SOR.Content/ContentMessages.cs +++ b/Server/src/SOR.Content/ContentMessages.cs @@ -134,28 +134,38 @@ public sealed record CardAnimationBindingDto( // ── Skybox config ───────────────────────────────────────────────────────────── -/// Fetch the currently active skybox definition (if any). +/// Fetch all active skybox definitions. public sealed record GetSkyboxConfigRequest; /// /// Response for content.get_skybox_config. -/// Skybox is null when no skybox is active (client keeps the default procedural sky). +/// Returns all active skyboxes; the client picks one randomly each session. +/// Empty array means no skybox is active (client keeps the default procedural sky). /// -public sealed record GetSkyboxConfigResponse(SkyboxDefinitionDto? Skybox); +public sealed record GetSkyboxConfigResponse(SkyboxDefinitionDto[] Skyboxes); /// /// Describes one skybox for use in the 3D gameplay scene. /// -/// Static: CdnPath is the full URL to a panoramic image (PNG/JPG). -/// Animated: CdnPath is the base folder URL; frames are at {CdnPath}/0.png, /1.png, etc. +/// Panoramic: CdnPath is the full URL to a panoramic image (PNG/JPG). +/// AnimatedPanorama: CdnPath is the base folder URL; frames are at {CdnPath}/0.png, /1.png, etc. +/// Cubemap: Six face URLs (CubePxUrl … CubeNzUrl) assemble a Godot 4 Cubemap sky. +/// CubePzUrl (front face) also serves as the 2D background for non-game scenes. /// public sealed record SkyboxDefinitionDto( - Guid Id, - string Name, - bool IsAnimated, - string CdnPath, - int FrameCount, - float Fps); + Guid Id, + string Name, + string Type, + bool IsAnimated, + string CdnPath, + int FrameCount, + float Fps, + string? CubePxUrl, + string? CubeNxUrl, + string? CubePyUrl, + string? CubeNyUrl, + string? CubePzUrl, + string? CubeNzUrl); // ── Highlight config ────────────────────────────────────────────────────────── diff --git a/Server/src/SOR.Content/Handlers/ContentGetSkyboxConfigHandler.cs b/Server/src/SOR.Content/Handlers/ContentGetSkyboxConfigHandler.cs index 566dd55..0823f78 100644 --- a/Server/src/SOR.Content/Handlers/ContentGetSkyboxConfigHandler.cs +++ b/Server/src/SOR.Content/Handlers/ContentGetSkyboxConfigHandler.cs @@ -26,14 +26,19 @@ internal sealed class ContentGetSkyboxConfigHandler : IMessageHandler AuthenticatedConnection connection, CancellationToken ct) { - var skybox = await _catalogDb.SkyboxDefinitions + var skyboxes = await _catalogDb.SkyboxDefinitions .AsNoTracking() .Where(s => s.IsActive) - .OrderByDescending(s => s.CreatedAt) - .Select(s => new SkyboxDefinitionDto(s.Id, s.Name, s.IsAnimated, s.CdnPath, s.FrameCount, s.Fps)) - .FirstOrDefaultAsync(ct); + .OrderBy(s => s.CreatedAt) + .ToListAsync(ct); + + var dtos = skyboxes.Select(s => new SkyboxDefinitionDto( + s.Id, s.Name, s.SkyboxType ?? "Panoramic", s.IsAnimated, + s.CdnPath, s.FrameCount, s.Fps, + s.CubePxUrl, s.CubeNxUrl, s.CubePyUrl, s.CubeNyUrl, s.CubePzUrl, s.CubeNzUrl + )).ToArray(); return ServerMessage.Reply("content.get_skybox_config.ack", message.Seq, - new GetSkyboxConfigResponse(skybox)); + new GetSkyboxConfigResponse(dtos)); } } diff --git a/Server/src/SOR.Database/Contexts/CatalogDbContext.cs b/Server/src/SOR.Database/Contexts/CatalogDbContext.cs index 8c9ce6f..2312260 100644 --- a/Server/src/SOR.Database/Contexts/CatalogDbContext.cs +++ b/Server/src/SOR.Database/Contexts/CatalogDbContext.cs @@ -171,6 +171,13 @@ public sealed class CatalogDbContext : DbContext e.HasKey(s => s.Id); e.Property(s => s.Name).IsRequired(); e.Property(s => s.CdnPath).IsRequired(); + e.Property(s => s.SkyboxType).HasColumnName("skybox_type"); + e.Property(s => s.CubePxUrl).HasColumnName("cube_px_url"); + e.Property(s => s.CubeNxUrl).HasColumnName("cube_nx_url"); + e.Property(s => s.CubePyUrl).HasColumnName("cube_py_url"); + e.Property(s => s.CubeNyUrl).HasColumnName("cube_ny_url"); + e.Property(s => s.CubePzUrl).HasColumnName("cube_pz_url"); + e.Property(s => s.CubeNzUrl).HasColumnName("cube_nz_url"); e.HasIndex(s => s.IsActive); }); diff --git a/Server/src/SOR.Database/Entities/Catalog/SkyboxDefinition.cs b/Server/src/SOR.Database/Entities/Catalog/SkyboxDefinition.cs index d5838d2..49f1690 100644 --- a/Server/src/SOR.Database/Entities/Catalog/SkyboxDefinition.cs +++ b/Server/src/SOR.Database/Entities/Catalog/SkyboxDefinition.cs @@ -3,13 +3,13 @@ namespace SOR.Database.Entities.Catalog; /// /// Defines a skybox displayed in the 3D gameplay scene. /// -/// Static skyboxes: CdnPath is the full URL to a single panoramic image (PNG/JPG/HDR). -/// Animated skyboxes: CdnPath is the base URL of a frame folder. +/// Panoramic skyboxes: CdnPath is the full URL to a single panoramic image (PNG/JPG/HDR). +/// AnimatedPanorama skyboxes: CdnPath is the base URL of a frame folder. /// Frames are named {CdnPath}/0.png, {CdnPath}/1.png, … {CdnPath}/{FrameCount-1}.png. /// The client downloads all frames and cycles through them at Fps frames per second. +/// Cubemap skyboxes: Six face URLs (CubePxUrl … CubeNzUrl) are assembled into a Godot 4 Cubemap. /// -/// Only the skybox with IsActive = true is served to clients. -/// At most one skybox should be active at a time; the admin panel enforces this. +/// Multiple skyboxes may be active simultaneously; the client picks one randomly each session. /// public sealed class SkyboxDefinition { @@ -18,15 +18,20 @@ public sealed class SkyboxDefinition /// Human-readable display name shown in the admin panel. public string Name { get; set; } = string.Empty; + /// "Panoramic" | "AnimatedPanorama" | "Cubemap". Null treated as "Panoramic". + public string? SkyboxType { get; set; } + /// /// When false: CdnPath is a direct URL to a single panoramic image. /// When true: CdnPath is a base folder URL; frames are sequential PNGs starting at /0.png. + /// Kept for backward compatibility; prefer SkyboxType. /// public bool IsAnimated { get; set; } /// - /// For static: full CDN URL to the panoramic image (e.g. https://cdn.sor.gg/skyboxes/night.png). - /// For animated: base folder URL without trailing slash (e.g. https://cdn.sor.gg/skyboxes/aurora). + /// For Panoramic: full CDN URL to the panoramic image (e.g. https://cdn.sor.gg/skyboxes/night.png). + /// For AnimatedPanorama: base folder URL without trailing slash (e.g. https://cdn.sor.gg/skyboxes/aurora). + /// Not used for Cubemap type. /// public string CdnPath { get; set; } = string.Empty; @@ -39,9 +44,23 @@ public sealed class SkyboxDefinition /// Playback speed in frames per second. Ignored for static skyboxes. public float Fps { get; set; } = 24f; + // ── Cubemap face URLs (used when SkyboxType == "Cubemap") ────────────── + /// +X Right face URL. + public string? CubePxUrl { get; set; } + /// -X Left face URL. + public string? CubeNxUrl { get; set; } + /// +Y Top face URL. + public string? CubePyUrl { get; set; } + /// -Y Bottom face URL. + public string? CubeNyUrl { get; set; } + /// +Z Front face URL. Also used as the 2D background image for 2D scenes. + public string? CubePzUrl { get; set; } + /// -Z Back face URL. + public string? CubeNzUrl { get; set; } + /// - /// When true, this skybox is served to game clients. - /// Deactivate all others before activating a new one. + /// When true, this skybox is included in the active pool served to game clients. + /// Multiple skyboxes may be active; the client picks one randomly each session. /// public bool IsActive { get; set; } diff --git a/Server/src/SOR.Database/Migrations/Catalog/20260325201027_AddSkyboxCubemapType.Designer.cs b/Server/src/SOR.Database/Migrations/Catalog/20260325201027_AddSkyboxCubemapType.Designer.cs new file mode 100644 index 0000000..b12864e --- /dev/null +++ b/Server/src/SOR.Database/Migrations/Catalog/20260325201027_AddSkyboxCubemapType.Designer.cs @@ -0,0 +1,604 @@ +// +using System; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; +using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; +using SOR.Database.Contexts; + +#nullable disable + +namespace SOR.Database.Migrations.Catalog +{ + [DbContext(typeof(CatalogDbContext))] + [Migration("20260325201027_AddSkyboxCubemapType")] + partial class AddSkyboxCubemapType + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder + .HasDefaultSchema("catalog") + .HasAnnotation("ProductVersion", "8.0.0") + .HasAnnotation("Relational:MaxIdentifierLength", 63); + + NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.CardAnimationBinding", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("ActionName") + .IsRequired() + .HasColumnType("text"); + + b.Property("AnimationCdnUrl") + .IsRequired() + .HasColumnType("text"); + + b.Property("AnimationTrackName") + .HasColumnType("text"); + + b.Property("CardDefinitionId") + .HasColumnType("uuid"); + + b.Property("CastSoundCdnUrl") + .HasColumnType("text"); + + b.Property("ImpactSoundCdnUrl") + .HasColumnType("text"); + + b.Property("IsAiGenerated") + .HasColumnType("boolean"); + + b.HasKey("Id"); + + b.HasIndex("CardDefinitionId", "ActionName") + .IsUnique(); + + b.ToTable("card_animation_bindings", "catalog"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.CardAsset", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("AssetType") + .IsRequired() + .HasColumnType("text"); + + b.Property("CardDefinitionId") + .HasColumnType("uuid"); + + b.Property("CdnUrl") + .IsRequired() + .HasColumnType("text"); + + b.Property("ContentETag") + .HasColumnType("text"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("IsAiGenerated") + .HasColumnType("boolean"); + + b.Property("MimeType") + .HasColumnType("text"); + + b.Property("ModelFacingDirection") + .HasColumnType("text"); + + b.Property("ModelTintMaskUrl") + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("CardDefinitionId", "AssetType"); + + b.ToTable("card_assets", "catalog"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.CardDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("AbilitiesJson") + .HasColumnType("jsonb") + .HasColumnName("abilities"); + + b.Property("Affinity") + .IsRequired() + .HasColumnType("text"); + + b.Property("AttackSoundUrl") + .HasColumnType("text"); + + b.Property("AttackType") + .HasColumnType("text"); + + b.Property("BlockedSoundUrl") + .HasColumnType("text"); + + b.Property("CanAttack") + .HasColumnType("boolean"); + + b.Property("CanBeAttacked") + .HasColumnType("boolean"); + + b.Property("CanBeBlocked") + .HasColumnType("boolean"); + + b.Property("CanBeObstructed") + .HasColumnType("boolean"); + + b.Property("CanBeSacrificed") + .HasColumnType("boolean"); + + b.Property("CanDefend") + .HasColumnType("boolean"); + + b.Property("CanMove") + .HasColumnType("boolean"); + + b.Property("CanUseAbility") + .HasColumnType("boolean"); + + b.Property("CardType") + .IsRequired() + .HasColumnType("text"); + + b.Property("CollectorNumber") + .HasColumnType("integer"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("Damage") + .HasColumnType("integer"); + + b.Property("DamagedSoundUrl") + .HasColumnType("text"); + + b.Property("DeathSoundUrl") + .HasColumnType("text"); + + b.Property("DefinitionVersion") + .ValueGeneratedOnAdd() + .HasColumnType("bigint") + .HasDefaultValue(0L); + + b.Property("Description") + .IsRequired() + .HasColumnType("text"); + + b.Property("EffectsJson") + .HasColumnType("jsonb") + .HasColumnName("effects"); + + b.Property("Genus") + .HasColumnType("text[]"); + + b.Property("IsPublished") + .HasColumnType("boolean"); + + b.Property("IsRetired") + .HasColumnType("boolean"); + + b.Property("MaxAttackRange") + .HasColumnType("integer"); + + b.Property("MaxChannelRange") + .HasColumnType("integer"); + + b.Property("MaxDefense") + .HasColumnType("integer"); + + b.Property("MaxHealth") + .HasColumnType("integer"); + + b.Property("MinAttackRange") + .HasColumnType("integer"); + + b.Property("MinChannelRange") + .HasColumnType("integer"); + + b.Property("ModelScale") + .HasColumnType("real"); + + b.Property("ModelTintColor") + .HasColumnType("text"); + + b.Property("MoveSoundUrl") + .HasColumnType("text"); + + b.Property("MovementPoints") + .HasColumnType("integer"); + + b.Property("MovementType") + .HasColumnType("text"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("OtherCostsJson") + .HasColumnType("jsonb") + .HasColumnName("other_costs"); + + b.Property("PreviousTierId") + .HasColumnType("uuid"); + + b.Property("Rarity") + .IsRequired() + .HasColumnType("text"); + + b.Property("RequiresLos") + .HasColumnType("boolean"); + + b.Property("RetiredAt") + .HasColumnType("timestamp with time zone"); + + b.Property("SetId") + .HasColumnType("uuid"); + + b.Property("SpCost") + .HasColumnType("integer"); + + b.Property("StCost") + .HasColumnType("integer"); + + b.Property("TerramorphaMode") + .HasColumnType("text"); + + b.Property("Tier") + .HasColumnType("integer"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.HasIndex("Affinity"); + + b.HasIndex("CardType"); + + b.HasIndex("DefinitionVersion"); + + b.HasIndex("Name"); + + b.HasIndex("PreviousTierId"); + + b.HasIndex("Rarity"); + + b.HasIndex("SetId"); + + b.HasIndex("IsPublished", "SetId"); + + b.ToTable("card_definitions", "catalog"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.CardSet", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Code") + .IsRequired() + .HasColumnType("text"); + + b.Property("Description") + .HasColumnType("text"); + + b.Property("IsActive") + .HasColumnType("boolean"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("ReleaseDate") + .HasColumnType("date"); + + b.HasKey("Id"); + + b.HasIndex("Code") + .IsUnique(); + + b.ToTable("card_sets", "catalog"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.CdnUploadRecord", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("ContentType") + .HasColumnType("text"); + + b.Property("IsAiGenerated") + .HasColumnType("boolean"); + + b.Property("ObjectKey") + .IsRequired() + .HasColumnType("text"); + + b.Property("Prefix") + .IsRequired() + .HasColumnType("text"); + + b.Property("PublicUrl") + .IsRequired() + .HasColumnType("text"); + + b.Property("UploadedAt") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.HasIndex("IsAiGenerated"); + + b.HasIndex("ObjectKey") + .IsUnique(); + + b.HasIndex("Prefix"); + + b.ToTable("cdn_upload_records", "catalog"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.GameAudioConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Context") + .IsRequired() + .HasColumnType("text"); + + b.Property("IsActive") + .HasColumnType("boolean"); + + b.Property("TrackCdnUrl") + .IsRequired() + .HasColumnType("text"); + + b.Property("TrackName") + .IsRequired() + .HasColumnType("text"); + + b.HasKey("Id"); + + b.HasIndex("Context"); + + b.HasIndex("IsActive"); + + b.ToTable("game_audio_configs", "catalog"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.HighlightConfig", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("CdnPath") + .IsRequired() + .HasColumnType("text"); + + b.Property("FallbackHex") + .IsRequired() + .HasColumnType("text"); + + b.Property("Fps") + .HasColumnType("real"); + + b.Property("FrameCount") + .HasColumnType("integer"); + + b.Property("HighlightType") + .IsRequired() + .HasColumnType("text"); + + b.Property("IsAnimated") + .HasColumnType("boolean"); + + b.HasKey("Id"); + + b.HasIndex("HighlightType") + .IsUnique(); + + b.ToTable("highlight_configs", "catalog"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.SkyboxDefinition", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("CdnPath") + .IsRequired() + .HasColumnType("text"); + + b.Property("CreatedAt") + .HasColumnType("timestamp with time zone"); + + b.Property("CubeNxUrl") + .HasColumnType("text") + .HasColumnName("cube_nx_url"); + + b.Property("CubeNyUrl") + .HasColumnType("text") + .HasColumnName("cube_ny_url"); + + b.Property("CubeNzUrl") + .HasColumnType("text") + .HasColumnName("cube_nz_url"); + + b.Property("CubePxUrl") + .HasColumnType("text") + .HasColumnName("cube_px_url"); + + b.Property("CubePyUrl") + .HasColumnType("text") + .HasColumnName("cube_py_url"); + + b.Property("CubePzUrl") + .HasColumnType("text") + .HasColumnName("cube_pz_url"); + + b.Property("Fps") + .HasColumnType("real"); + + b.Property("FrameCount") + .HasColumnType("integer"); + + b.Property("IsActive") + .HasColumnType("boolean"); + + b.Property("IsAnimated") + .HasColumnType("boolean"); + + b.Property("Name") + .IsRequired() + .HasColumnType("text"); + + b.Property("SkyboxType") + .HasColumnType("text") + .HasColumnName("skybox_type"); + + b.HasKey("Id"); + + b.HasIndex("IsActive"); + + b.ToTable("skybox_definitions", "catalog"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.TileBottomModel", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("CdnKey") + .IsRequired() + .HasColumnType("text"); + + b.Property("IsActive") + .HasColumnType("boolean"); + + b.Property("PublicUrl") + .IsRequired() + .HasColumnType("text"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.HasIndex("IsActive"); + + b.ToTable("tile_bottom_models", "catalog"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.TileModelBinding", b => + { + b.Property("Id") + .ValueGeneratedOnAdd() + .HasColumnType("uuid"); + + b.Property("Affinity") + .IsRequired() + .HasColumnType("text"); + + b.Property("ModelCdnKey") + .IsRequired() + .HasColumnType("text"); + + b.Property("ModelPublicUrl") + .IsRequired() + .HasColumnType("text"); + + b.Property("Shape") + .IsRequired() + .HasColumnType("text"); + + b.Property("TexturePublicUrl") + .HasColumnType("text"); + + b.Property("UpdatedAt") + .HasColumnType("timestamp with time zone"); + + b.HasKey("Id"); + + b.HasIndex("Affinity", "Shape") + .IsUnique(); + + b.ToTable("tile_model_bindings", "catalog"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.CardAnimationBinding", b => + { + b.HasOne("SOR.Database.Entities.Catalog.CardDefinition", "CardDefinition") + .WithMany("AnimationBindings") + .HasForeignKey("CardDefinitionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("CardDefinition"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.CardAsset", b => + { + b.HasOne("SOR.Database.Entities.Catalog.CardDefinition", "CardDefinition") + .WithMany("Assets") + .HasForeignKey("CardDefinitionId") + .OnDelete(DeleteBehavior.Cascade) + .IsRequired(); + + b.Navigation("CardDefinition"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.CardDefinition", b => + { + b.HasOne("SOR.Database.Entities.Catalog.CardDefinition", "PreviousTier") + .WithMany() + .HasForeignKey("PreviousTierId") + .OnDelete(DeleteBehavior.SetNull); + + b.HasOne("SOR.Database.Entities.Catalog.CardSet", "Set") + .WithMany("Cards") + .HasForeignKey("SetId") + .OnDelete(DeleteBehavior.SetNull); + + b.Navigation("PreviousTier"); + + b.Navigation("Set"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.CardDefinition", b => + { + b.Navigation("AnimationBindings"); + + b.Navigation("Assets"); + }); + + modelBuilder.Entity("SOR.Database.Entities.Catalog.CardSet", b => + { + b.Navigation("Cards"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Server/src/SOR.Database/Migrations/Catalog/20260325201027_AddSkyboxCubemapType.cs b/Server/src/SOR.Database/Migrations/Catalog/20260325201027_AddSkyboxCubemapType.cs new file mode 100644 index 0000000..e8abfa6 --- /dev/null +++ b/Server/src/SOR.Database/Migrations/Catalog/20260325201027_AddSkyboxCubemapType.cs @@ -0,0 +1,102 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace SOR.Database.Migrations.Catalog +{ + /// + public partial class AddSkyboxCubemapType : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.AddColumn( + name: "cube_nx_url", + schema: "catalog", + table: "skybox_definitions", + type: "text", + nullable: true); + + migrationBuilder.AddColumn( + name: "cube_ny_url", + schema: "catalog", + table: "skybox_definitions", + type: "text", + nullable: true); + + migrationBuilder.AddColumn( + name: "cube_nz_url", + schema: "catalog", + table: "skybox_definitions", + type: "text", + nullable: true); + + migrationBuilder.AddColumn( + name: "cube_px_url", + schema: "catalog", + table: "skybox_definitions", + type: "text", + nullable: true); + + migrationBuilder.AddColumn( + name: "cube_py_url", + schema: "catalog", + table: "skybox_definitions", + type: "text", + nullable: true); + + migrationBuilder.AddColumn( + name: "cube_pz_url", + schema: "catalog", + table: "skybox_definitions", + type: "text", + nullable: true); + + migrationBuilder.AddColumn( + name: "skybox_type", + schema: "catalog", + table: "skybox_definitions", + type: "text", + nullable: true); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropColumn( + name: "cube_nx_url", + schema: "catalog", + table: "skybox_definitions"); + + migrationBuilder.DropColumn( + name: "cube_ny_url", + schema: "catalog", + table: "skybox_definitions"); + + migrationBuilder.DropColumn( + name: "cube_nz_url", + schema: "catalog", + table: "skybox_definitions"); + + migrationBuilder.DropColumn( + name: "cube_px_url", + schema: "catalog", + table: "skybox_definitions"); + + migrationBuilder.DropColumn( + name: "cube_py_url", + schema: "catalog", + table: "skybox_definitions"); + + migrationBuilder.DropColumn( + name: "cube_pz_url", + schema: "catalog", + table: "skybox_definitions"); + + migrationBuilder.DropColumn( + name: "skybox_type", + schema: "catalog", + table: "skybox_definitions"); + } + } +} diff --git a/Server/src/SOR.Database/Migrations/Catalog/CatalogDbContextModelSnapshot.cs b/Server/src/SOR.Database/Migrations/Catalog/CatalogDbContextModelSnapshot.cs index b947c71..db8a604 100644 --- a/Server/src/SOR.Database/Migrations/Catalog/CatalogDbContextModelSnapshot.cs +++ b/Server/src/SOR.Database/Migrations/Catalog/CatalogDbContextModelSnapshot.cs @@ -431,6 +431,30 @@ namespace SOR.Database.Migrations.Catalog b.Property("CreatedAt") .HasColumnType("timestamp with time zone"); + b.Property("CubeNxUrl") + .HasColumnType("text") + .HasColumnName("cube_nx_url"); + + b.Property("CubeNyUrl") + .HasColumnType("text") + .HasColumnName("cube_ny_url"); + + b.Property("CubeNzUrl") + .HasColumnType("text") + .HasColumnName("cube_nz_url"); + + b.Property("CubePxUrl") + .HasColumnType("text") + .HasColumnName("cube_px_url"); + + b.Property("CubePyUrl") + .HasColumnType("text") + .HasColumnName("cube_py_url"); + + b.Property("CubePzUrl") + .HasColumnType("text") + .HasColumnName("cube_pz_url"); + b.Property("Fps") .HasColumnType("real"); @@ -447,6 +471,10 @@ namespace SOR.Database.Migrations.Catalog .IsRequired() .HasColumnType("text"); + b.Property("SkyboxType") + .HasColumnType("text") + .HasColumnName("skybox_type"); + b.HasKey("Id"); b.HasIndex("IsActive");