diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab index fd5bbcb5..998688fc 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XR Origin.prefab @@ -399,7 +399,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4260766096620860208 RectTransform: m_ObjectHideFlags: 0 @@ -1298,7 +1298,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5995638939731525439 RectTransform: m_ObjectHideFlags: 0 @@ -8112,7 +8112,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8807789255226040880} - m_Enabled: 0 + m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0bf296fc962d7184ab14ad1841598d5f, type: 3} m_Name: diff --git a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/Continuos locomotion Conf.cs b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/Continuos locomotion Conf.cs index 30c2e8da..2375b63a 100644 --- a/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/Continuos locomotion Conf.cs +++ b/Assets/_PROJECT/Components/NewHandPresence/Prefabs/XROrigin Scripts/Continuos locomotion Conf.cs @@ -19,7 +19,7 @@ public class ContinuoslocomotionConfigurator : MonoBehaviour { turnOnButton.onClick.AddListener(enableLocomotion); turnOffButton.onClick.AddListener(disableLocomotion); - turnOffButton.gameObject.SetActive(false); + turnOnButton.gameObject.SetActive(false); } public void UpdateSpeed(float speed) diff --git a/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationManager.prefab b/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationManager.prefab index 5c0f4c2a..e2b728a8 100644 --- a/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationManager.prefab +++ b/Assets/_PROJECT/Prefabs/ModelGeneration/ModelGenerationManager.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: 2166102850012183631} - component: {fileID: 8356602476881383464} - component: {fileID: 5682436338090300270} + - component: {fileID: 5910538061401192019} m_Layer: 0 m_Name: ModelGenerationManager m_TagString: Untagged @@ -60,9 +61,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4591f6805db240a4ca28e515091ca909, type: 3} m_Name: m_EditorClassIdentifier: - INVOKEAI_BASE_URL: http://ltat-cgvr9.domenis.ut.ee:9090 DEFAULT_QUEUE_ID: default - MODEL_KEY: 81d45960-08a0-4b8c-a48b-e7d73b21bfe2 promptSuffix: ', single object, front and side fully visible, realistic style, plain neutral background, clear details, soft studio lighting, true-to-scale' --- !u!114 &2166102850012183631 @@ -77,7 +76,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 905247c726697644cbf0f39558db46bb, type: 3} m_Name: m_EditorClassIdentifier: - TRELLIS_BASE_URL: http://ltat-cgvr9.domenis.ut.ee:7960 --- !u!114 &8356602476881383464 MonoBehaviour: m_ObjectHideFlags: 0 @@ -131,3 +129,15 @@ MonoBehaviour: bufferLengthSec: 5 playLoopback: 0 loopbackVolume: 1 +--- !u!114 &5910538061401192019 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 154411548685861447} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6a9ed26713a3c4c4f8f6be3bbd4af5c7, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/ConfigManager.cs b/Assets/_PROJECT/Scripts/ModeGeneration/ConfigManager.cs index e4c5a412..93409ed1 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/ConfigManager.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/ConfigManager.cs @@ -6,7 +6,7 @@ public class ConfigManager : MonoBehaviour { public GameConfig Config { get; private set; } public static ConfigManager Instance { get; private set; } - private static string configPath => Path.Combine(Application.persistentDataPath, "config.json"); + public static string configPath = "config.json"; private void Awake() { diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/GameConfig.cs b/Assets/_PROJECT/Scripts/ModeGeneration/GameConfig.cs index 7296c3c6..5a64dd3a 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/GameConfig.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/GameConfig.cs @@ -2,7 +2,7 @@ [System.Serializable] public class GameConfig { - public string invokeAIUrl = "http://192.168.0.53:9090"; - public string invokeAIModelKey = "81d45960-08a0-4b8c-a48b-e7d73b21bfe2"; + public string InvokeAIUrl = "http://192.168.0.53:9090"; + public string InvokeAIModelKey = "81d45960-08a0-4b8c-a48b-e7d73b21bfe2"; public string TrellisUrl = "http://192.168.0.53:7960"; } diff --git a/Assets/_PROJECT/Scripts/ModeGeneration/InvokeAiClient.cs b/Assets/_PROJECT/Scripts/ModeGeneration/InvokeAiClient.cs index d9d3f767..5d88699a 100644 --- a/Assets/_PROJECT/Scripts/ModeGeneration/InvokeAiClient.cs +++ b/Assets/_PROJECT/Scripts/ModeGeneration/InvokeAiClient.cs @@ -31,7 +31,7 @@ public class InvokeAiClient : MonoBehaviour { Timeout = TimeSpan.FromSeconds(120) }; - httpClient.BaseAddress = new Uri(ConfigManager.Instance.Config.invokeAIUrl); + httpClient.BaseAddress = new Uri(ConfigManager.Instance.Config.InvokeAIUrl); } // Update is called once per frame @@ -516,7 +516,7 @@ public class InvokeAiClient : MonoBehaviour public async Task GenerateImage(string prompt) { - string modelKey = ConfigManager.Instance.Config.invokeAIModelKey; + string modelKey = ConfigManager.Instance.Config.InvokeAIModelKey; string refinedPrompt = prompt + promptSuffix; JObject args = new JObject() { diff --git a/config.json b/config.json new file mode 100644 index 00000000..a7a6e9d0 --- /dev/null +++ b/config.json @@ -0,0 +1,5 @@ +{ + "InvokeAIUrl": "http://192.168.0.53:9090", + "InvokeAIModelKey": "81d45960-08a0-4b8c-a48b-e7d73b21bfe2", + "TrellisUrl": "http://192.168.0.53:7960" +} \ No newline at end of file