Continued improving the new OASIS Omniverse OS :)

dellams · dellams · commit cc5fa7b28e5b · 2026-02-16T14:04:46.000-05:00
- Improving ODOOM Inventory System (getting the text to appear when sending an item to an avatar or clan).
diff --git a/OASIS Omniverse/OASIS Omniverse/Assets/Scenes/OmniverseHub.unity b/OASIS Omniverse/OASIS Omniverse/Assets/Scenes/OmniverseHub.unity
@@ -312,3 +312,5 @@ SceneRoots:
   - {fileID: 705507999}
   - {fileID: 1025559642}
 
+
+
diff --git a/OASIS Omniverse/OASIS Omniverse/Assets/Scripts/Rendering/CinematicPortalGlow.cs b/OASIS Omniverse/OASIS Omniverse/Assets/Scripts/Rendering/CinematicPortalGlow.cs
@@ -51,3 +51,5 @@ private void OnRenderImage(RenderTexture source, RenderTexture destination)
     }
 }
 
+
+
diff --git a/OASIS Omniverse/OASIS Omniverse/Assets/Scripts/Runtime/GlobalSettingsService.cs b/OASIS Omniverse/OASIS Omniverse/Assets/Scripts/Runtime/GlobalSettingsService.cs
@@ -165,3 +165,5 @@ private static void ApplyToUnity(OmniverseGlobalSettings settings)
     }
 }
 
+
+
diff --git a/OASIS Omniverse/OASIS Omniverse/Assets/Shaders/PortalGlowPost.shader b/OASIS Omniverse/OASIS Omniverse/Assets/Shaders/PortalGlowPost.shader
@@ -37,3 +37,5 @@ Shader "Hidden/OASIS/PortalGlow"
     }
 }
 
+
+
diff --git a/OASIS Omniverse/OASIS Omniverse/ProjectSettings/EditorBuildSettings.asset b/OASIS Omniverse/OASIS Omniverse/ProjectSettings/EditorBuildSettings.asset
@@ -10,3 +10,5 @@ EditorBuildSettings:
     guid: 9e1d3f74c5b94a4f9a89a4b4ccde4ed1
   m_configObjects: {}
 
+
+
diff --git a/OASIS Omniverse/ODOOM/build/ODOOM.exe b/OASIS Omniverse/ODOOM/build/ODOOM.exe
diff --git a/OASIS Omniverse/ODOOM/build/odoom_face.pk3 b/OASIS Omniverse/ODOOM/build/odoom_face.pk3
diff --git a/OASIS Omniverse/ODOOM/build/uzdoom.pk3 b/OASIS Omniverse/ODOOM/build/uzdoom.pk3
diff --git a/OASIS Omniverse/ODOOM/create_odoom_face_pk3.py b/OASIS Omniverse/ODOOM/create_odoom_face_pk3.py
@@ -74,3 +74,5 @@ def main():
     main()
 
 
+
+
diff --git a/OASIS Omniverse/ODOOM/generate_oquake_mdl_sprites.py b/OASIS Omniverse/ODOOM/generate_oquake_mdl_sprites.py
@@ -921,3 +921,5 @@ def main(argv: List[str]) -> int:
 
 
 
+
+
diff --git a/OASIS Omniverse/ODOOM/odoom_face.pk3 b/OASIS Omniverse/ODOOM/odoom_face.pk3
diff --git a/OASIS Omniverse/ODOOM/odoom_inventory_popup.zs b/OASIS Omniverse/ODOOM/odoom_inventory_popup.zs
@@ -36,7 +36,7 @@ class OASISInventoryOverlayHandler : EventHandler
 	private int sendButtonFocus;  // 0=Send, 1=Cancel
 	private String sendItemClass;
 	private int sendMaxQty;
-	private String sendInputLine;  // name typed in send popup (ZScript-built from odoom_send_last_char); set to "" when opening send popup
+	private String sendInputLine;  // name built from odoom_send_last_char (C++ sets one char per frame)
 
 	const TAB_KEYS = 0;
 	const TAB_POWERUPS = 1;
@@ -216,6 +216,8 @@ class OASISInventoryOverlayHandler : EventHandler
 				sendItemClass = selectedItem.GetClassName();
 				sendMaxQty = selectedItem.Amount;
 				sendInputLine = "";
+				CVar lineVar = CVar.FindCVar("odoom_send_input_line");
+				if (lineVar != null) lineVar.SetString("");
 				CVar cv = CVar.FindCVar("odoom_send_popup_open");
 				if (cv != null) cv.SetInt(1);
 			}
@@ -228,6 +230,8 @@ class OASISInventoryOverlayHandler : EventHandler
 				sendItemClass = selectedItem.GetClassName();
 				sendMaxQty = selectedItem.Amount;
 				sendInputLine = "";
+				CVar lineVar = CVar.FindCVar("odoom_send_input_line");
+				if (lineVar != null) lineVar.SetString("");
 				CVar cv = CVar.FindCVar("odoom_send_popup_open");
 				if (cv != null) cv.SetInt(1);
 			}
@@ -236,7 +240,7 @@ class OASISInventoryOverlayHandler : EventHandler
 		// Send popup handling when open
 		if (sendPopupMode != 0)
 		{
-			// Typing: C++ sets odoom_send_last_char (0=none, 8=backspace, else ASCII)
+			// Build name from C++ odoom_send_last_char (one char per frame; 0=none, 8=backspace)
 			CVar lastCharVar = CVar.FindCVar("odoom_send_last_char");
 			if (lastCharVar != null)
 			{
@@ -249,7 +253,20 @@ class OASISInventoryOverlayHandler : EventHandler
 					oneChar.AppendCharacter(ch);
 					sendInputLine = String.Format("%s%s", sendInputLine, oneChar);
 				}
-				lastCharVar.SetInt(0);
+			}
+			// Also sync from full-line cvar so typing still shows if last-char path is unavailable.
+			CVar lineVarSync = CVar.FindCVar("odoom_send_input_line");
+			if (lineVarSync != null)
+			{
+				String syncLine = lineVarSync.GetString();
+				if (syncLine.Length() > 0 || sendInputLine.Length() == 0)
+					sendInputLine = syncLine;
+			}
+			else
+			{
+				// Fallback for builds missing odoom_send_last_char: read full line from string CVar.
+				CVar lineVar = CVar.FindCVar("odoom_send_input_line");
+				if (lineVar != null) sendInputLine = lineVar.GetString();
 			}
 			if (keyLeftPressed) sendButtonFocus = 0;
 			if (keyRightPressed) sendButtonFocus = 1;
@@ -452,7 +469,7 @@ class OASISInventoryOverlayHandler : EventHandler
 			screen.DrawText(f, Font.CR_UNTRANSLATED, popupX + 8, popupY + 20, String.Format("%s: %s_", label, sendInputLine), DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DTA_FullscreenScale, FSMode_ScaleToFit43);
 			String qtyText = String.Format("Quantity: %d / %d (Arrows)", sendQuantity, sendMaxQty);
 			screen.DrawText(f, Font.CR_UNTRANSLATED, popupX + 8, popupY + 32, qtyText, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DTA_FullscreenScale, FSMode_ScaleToFit43);
-			screen.DrawText(f, Font.CR_DARKGRAY, popupX + 8, popupY + 44, "Left=Send  Right=Cancel  Enter/E=Confirm  I=Cancel", DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DTA_FullscreenScale, FSMode_ScaleToFit43);
+			screen.DrawText(f, Font.CR_DARKGRAY, popupX + 8, popupY + 44, "Left=Send  Right=Cancel  Enter=Confirm", DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DTA_FullscreenScale, FSMode_ScaleToFit43);
 			if (sendButtonFocus == 0)
 				screen.DrawText(f, Font.CR_GREEN, popupX + 16, popupY + 60, "[SEND]", DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DTA_FullscreenScale, FSMode_ScaleToFit43);
 			else
diff --git a/OASIS Omniverse/ODOOM/textures/README.txt b/OASIS Omniverse/ODOOM/textures/README.txt
@@ -41,3 +41,5 @@ WAD method (using SLADE)
 Image size: 32x32 pixels matches the classic status bar face; other sizes will be scaled.
 
 
+
+
diff --git a/OASIS Omniverse/ODOOM/uzdoom_star_integration.cpp b/OASIS Omniverse/ODOOM/uzdoom_star_integration.cpp
@@ -107,10 +107,10 @@ void ODOOM_InventoryInputCaptureFrame(void)
 	if (open && !g_odoom_inventory_bindings_captured)
 	{
 		/* Clear arrow, movement, and inventory key bindings so game doesn't receive them (OQuake-style). */
-		C_DoCommand("bind Up \"\"");
-		C_DoCommand("bind Down \"\"");
-		C_DoCommand("bind Left \"\"");
-		C_DoCommand("bind Right \"\"");
+		C_DoCommand("bind uparrow \"\"");
+		C_DoCommand("bind downarrow \"\"");
+		C_DoCommand("bind leftarrow \"\"");
+		C_DoCommand("bind rightarrow \"\"");
 		C_DoCommand("bind W \"\"");
 		C_DoCommand("bind S \"\"");
 		C_DoCommand("bind A \"\"");
@@ -123,17 +123,17 @@ void ODOOM_InventoryInputCaptureFrame(void)
 		C_DoCommand("bind I \"\"");
 		C_DoCommand("bind O \"\"");
 		C_DoCommand("bind P \"\"");
-		C_DoCommand("bind Return \"\"");
-		C_DoCommand("bind KP_Enter \"\"");
+		C_DoCommand("bind enter \"\"");
+		C_DoCommand("bind kpenter \"\"");
 		g_odoom_inventory_bindings_captured = true;
 	}
 	else if (!open && g_odoom_inventory_bindings_captured)
 	{
 		/* Restore default bindings (user can rebind in options). */
-		C_DoCommand("bind Up \"+forward\"");
-		C_DoCommand("bind Down \"+back\"");
-		C_DoCommand("bind Left \"+left\"");
-		C_DoCommand("bind Right \"+right\"");
+		C_DoCommand("bind uparrow \"+forward\"");
+		C_DoCommand("bind downarrow \"+back\"");
+		C_DoCommand("bind leftarrow \"+left\"");
+		C_DoCommand("bind rightarrow \"+right\"");
 		C_DoCommand("bind W \"+forward\"");
 		C_DoCommand("bind S \"+back\"");
 		C_DoCommand("bind A \"+moveleft\"");
@@ -146,8 +146,8 @@ void ODOOM_InventoryInputCaptureFrame(void)
 		C_DoCommand("bind I \"+user1\"");
 		C_DoCommand("bind O \"+user2\"");
 		C_DoCommand("bind P \"+user3\"");
-		C_DoCommand("bind Return \"+use\"");
-		C_DoCommand("bind KP_Enter \"+use\"");
+		C_DoCommand("bind enter \"+use\"");
+		C_DoCommand("bind kpenter \"+use\"");
 		g_odoom_inventory_bindings_captured = false;
 	}
 
@@ -173,7 +173,10 @@ void ODOOM_InventoryInputCaptureFrame(void)
 
 	/* Send popup: text input buffer (OQuake-style) and execute send when ZScript requests */
 	FBaseCVar* sendOpenVar = FindCVar("odoom_send_popup_open", nullptr);
-	const bool sendOpen = (sendOpenVar && sendOpenVar->GetRealType() == CVAR_Int && sendOpenVar->GetGenericRep(CVAR_Int).Int != 0);
+	/* Robust fallback: keep typing capture active while inventory is open. */
+	bool sendOpen = open;
+	if (sendOpenVar && sendOpenVar->GetRealType() == CVAR_Int && sendOpenVar->GetGenericRep(CVAR_Int).Int != 0)
+		sendOpen = true;
 	if (sendOpen && !g_odoom_send_popup_was_open)
 	{
 		g_odoom_send_input_buffer.clear();
@@ -192,26 +195,36 @@ void ODOOM_InventoryInputCaptureFrame(void)
 			int vk = VK_BACK;
 			int down = ODOOM_GetRawKeyDown(vk);
 			if (down && !g_odoom_send_key_was_down[vk & 0xFF])
+			{
 				lastChar = 8;
+				if (!g_odoom_send_input_buffer.empty())
+					g_odoom_send_input_buffer.pop_back();
+			}
 			g_odoom_send_key_was_down[vk & 0xFF] = (down != 0);
 		}
 		if (lastChar == 0) {
 		/* A-Z (lowercase) */
-		for (int vk = 'A'; vk <= 'Z' && lastChar == 0; vk++)
+		for (int vk = 'A'; vk <= 'Z'; vk++)
 		{
 			int down = ODOOM_GetRawKeyDown(vk);
 			if (down && !g_odoom_send_key_was_down[vk & 0xFF] && (int)g_odoom_send_input_buffer.size() < ODOOM_SEND_INPUT_MAX)
+			{
 				lastChar = (GetAsyncKeyState(VK_SHIFT) & 0x8000) ? vk : (vk - 'A' + 'a');
+				g_odoom_send_input_buffer += (char)lastChar;
+			}
 			g_odoom_send_key_was_down[vk & 0xFF] = (down != 0);
 		}
 		}
 		if (lastChar == 0) {
 		/* 0-9 */
-		for (int vk = '0'; vk <= '9' && lastChar == 0; vk++)
+		for (int vk = '0'; vk <= '9'; vk++)
 		{
 			int down = ODOOM_GetRawKeyDown(vk);
 			if (down && !g_odoom_send_key_was_down[vk & 0xFF] && (int)g_odoom_send_input_buffer.size() < ODOOM_SEND_INPUT_MAX)
+			{
 				lastChar = vk;
+				g_odoom_send_input_buffer += (char)vk;
+			}
 			g_odoom_send_key_was_down[vk & 0xFF] = (down != 0);
 		}
 		}
@@ -221,7 +234,10 @@ void ODOOM_InventoryInputCaptureFrame(void)
 			int vk = VK_SPACE;
 			int down = ODOOM_GetRawKeyDown(vk);
 			if (down && !g_odoom_send_key_was_down[vk & 0xFF] && (int)g_odoom_send_input_buffer.size() < ODOOM_SEND_INPUT_MAX)
+			{
 				lastChar = ' ';
+				g_odoom_send_input_buffer += ' ';
+			}
 			g_odoom_send_key_was_down[vk & 0xFF] = (down != 0);
 		}
 		}
@@ -233,20 +249,40 @@ void ODOOM_InventoryInputCaptureFrame(void)
 			int dmin = ODOOM_GetRawKeyDown(vk_minus);
 			int dper = ODOOM_GetRawKeyDown(vk_period);
 			if (dmin && !g_odoom_send_key_was_down[vk_minus & 0xFF] && (int)g_odoom_send_input_buffer.size() < ODOOM_SEND_INPUT_MAX)
+			{
 				lastChar = '-';
+				g_odoom_send_input_buffer += '-';
+			}
 			else if (dper && !g_odoom_send_key_was_down[vk_period & 0xFF] && (int)g_odoom_send_input_buffer.size() < ODOOM_SEND_INPUT_MAX)
+			{
 				lastChar = '.';
+				g_odoom_send_input_buffer += '.';
+			}
 			g_odoom_send_key_was_down[vk_minus & 0xFF] = (dmin != 0);
 			g_odoom_send_key_was_down[vk_period & 0xFF] = (dper != 0);
 		}
 		}
 #endif
+		/* ZScript reads this and appends to its display string (string CVar may not work in all builds) */
 		FBaseCVar* lastCharVar = FindCVar("odoom_send_last_char", nullptr);
 		if (lastCharVar && lastCharVar->GetRealType() == CVAR_Int)
 		{
 			UCVarValue u; u.Int = lastChar;
 			lastCharVar->SetGenericRep(u, CVAR_Int);
 		}
+		/* Also write full line to string CVar for display/send */
+		FBaseCVar* lineVar = FindCVar("odoom_send_input_line", nullptr);
+		if (lineVar && lineVar->GetRealType() == CVAR_String)
+		{
+			static char s_send_line_buf[ODOOM_SEND_INPUT_MAX + 1];
+			size_t len = g_odoom_send_input_buffer.size();
+			if (len > (size_t)ODOOM_SEND_INPUT_MAX) len = (size_t)ODOOM_SEND_INPUT_MAX;
+			std::memcpy(s_send_line_buf, g_odoom_send_input_buffer.c_str(), len);
+			s_send_line_buf[len] = '\0';
+			UCVarValue val;
+			val.String = s_send_line_buf;
+			lineVar->SetGenericRep(val, CVAR_String);
+		}
 	}
 
 	/* Execute send when ZScript set odoom_send_do_it=1 */
@@ -519,6 +555,7 @@ static bool StarTryInitializeAndAuthenticate(bool verbose) {
 			g_star_initialized = true;
 			g_star_logged_runtime_auth_failure = false;
 			g_star_logged_missing_auth_config = false;
+			oasis_star_anorak_face = true; /* Switch to OASIS face when beamed in */
 			odoom_star_username = g_star_effective_username.c_str();
 			if (logVerbose) StarLogInfo("Beam-in successful (SSO). Cross-game features enabled.");
 			return true;
@@ -535,6 +572,7 @@ static bool StarTryInitializeAndAuthenticate(bool verbose) {
 			g_star_initialized = true;
 			g_star_logged_runtime_auth_failure = false;
 			g_star_logged_missing_auth_config = false;
+			oasis_star_anorak_face = true; /* Switch to OASIS face when beamed in */
 			if (!g_star_effective_username.empty())
 				odoom_star_username = g_star_effective_username.c_str();
 			else if (!g_star_effective_avatar_id.empty())
diff --git a/OASIS Omniverse/OQuake/history.txt b/OASIS Omniverse/OQuake/history.txt
@@ -9,3 +9,5 @@ star beamin
 star beamin anorak test!
 star beamin
 star beamin anorak test!
+star
+star beamin anorak test!
diff --git a/OASIS Omniverse/STARAPIClient/.local_api_processes.json b/OASIS Omniverse/STARAPIClient/.local_api_processes.json
@@ -1,15 +1,15 @@
 ﻿{
-    "startedAtUtc":  "2026-02-16T03:43:02.8591967Z",
+    "startedAtUtc":  "2026-02-16T06:41:47.9824009Z",
     "web4Url":  "http://localhost:5003",
     "web5Url":  "http://localhost:5055",
     "processes":  [
                       {
-                          "pid":  19724,
+                          "pid":  24764,
                           "name":  "WEB4_OASIS_API",
                           "project":  "C:\\Source\\OASIS-master\\OASIS Omniverse\\STARAPIClient\\..\\..\\ONODE\\NextGenSoftware.OASIS.API.ONODE.WebAPI\\NextGenSoftware.OASIS.API.ONODE.WebAPI.csproj"
                       },
                       {
-                          "pid":  8212,
+                          "pid":  25092,
                           "name":  "WEB5_STAR_API",
                           "project":  "C:\\Source\\OASIS-master\\OASIS Omniverse\\STARAPIClient\\..\\..\\STAR ODK\\NextGenSoftware.OASIS.STAR.WebAPI\\NextGenSoftware.OASIS.STAR.WebAPI.csproj"
                       }
diff --git a/ONODE/NextGenSoftware.OASIS.API.ONODE.WebAPI/wwwroot/.gitkeep b/ONODE/NextGenSoftware.OASIS.API.ONODE.WebAPI/wwwroot/.gitkeep
@@ -9,3 +9,5 @@
 
 
 
+
+
diff --git a/STAR ODK/NextGenSoftware.OASIS.STAR.WebAPI/Program.cs b/STAR ODK/NextGenSoftware.OASIS.STAR.WebAPI/Program.cs

Original file line number	Diff line number	Diff line change
`@@ -51,3 +51,5 @@ private void OnRenderImage(RenderTexture source, RenderTexture destination)`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`
	`54`	`+`
	`55`	`+`
Original file line number	Diff line number	Diff line change
`@@ -165,3 +165,5 @@ private static void ApplyToUnity(OmniverseGlobalSettings settings)`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
	`168`	`+`
	`169`	`+`
Original file line number	Diff line number	Diff line change
`@@ -37,3 +37,5 @@ Shader "Hidden/OASIS/PortalGlow"`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
	`40`	`+`
	`41`	`+`
Original file line number	Diff line number	Diff line change
`@@ -74,3 +74,5 @@ def main():`
`74`	`74`	`main()`
`75`	`75`
`76`	`76`
	`77`	`+`
	`78`	`+`
Original file line number	Diff line number	Diff line change
`@@ -921,3 +921,5 @@ def main(argv: List[str]) -> int:`
`921`	`921`
`922`	`922`
`923`	`923`
	`924`	`+`
	`925`	`+`