1
0
forked from cgvr/DeltaVR

fix problems from merging with upstream

This commit is contained in:
2026-02-07 12:29:59 +02:00
parent b1d5b73df4
commit 0fbfaed5c3
12 changed files with 40 additions and 79 deletions

View File

@@ -1,39 +0,0 @@
using System.IO;
using UnityEngine;
public class ConfigManager : MonoBehaviour
{
public GameConfig Config { get; private set; }
public static ConfigManager Instance { get; private set; }
public static string configPath = "config.json";
private void Awake()
{
Instance = this;
LoadConfig();
}
public void LoadConfig()
{
if (File.Exists(configPath))
{
string json = File.ReadAllText(configPath);
Config = JsonUtility.FromJson<GameConfig>(json);
}
else
{
// Create config with default values
Config = new GameConfig();
SaveConfig();
}
Debug.Log("Loaded config from: " + configPath);
}
public void SaveConfig()
{
string json = JsonUtility.ToJson(Config, true);
File.WriteAllText(configPath, json);
}
}

View File

@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 6a9ed26713a3c4c4f8f6be3bbd4af5c7
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -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.GetInvokeAiUrl());
}
// Update is called once per frame
@@ -516,7 +516,7 @@ public class InvokeAiClient : MonoBehaviour
public async Task<byte[]> GenerateImage(string prompt)
{
string modelKey = ConfigManager.Instance.Config.InvokeAIModelKey;
string modelKey = ConfigManager.instance.GetInvokeAiModelKey();
string refinedPrompt = prompt + promptSuffix;
JObject args = new JObject()
{

View File

@@ -20,7 +20,7 @@ public class TrellisClient : MonoBehaviour
void Start()
{
httpClient = new HttpClient();
httpClient.BaseAddress = new Uri(ConfigManager.Instance.Config.TrellisUrl);
httpClient.BaseAddress = new Uri(ConfigManager.instance.GetTrellisUrl());
TestConnection();
}