tweeks + version number in config

This commit is contained in:
mcrcortex
2025-06-02 21:28:15 +10:00
parent c023e3b4f2
commit 204989b909
4 changed files with 5 additions and 4 deletions

View File

@@ -218,7 +218,7 @@ dependencies {
include(runtimeOnly "org.lwjgl:lwjgl-zstd:$lwjglVersion:natives-linux") include(runtimeOnly "org.lwjgl:lwjgl-zstd:$lwjglVersion:natives-linux")
include(implementation 'redis.clients:jedis:5.1.0') include(implementation 'redis.clients:jedis:5.1.0')
include(implementation('org.rocksdb:rocksdbjni:8.10.0')) include(implementation('org.rocksdb:rocksdbjni:10.2.1'))
include(implementation 'org.apache.commons:commons-pool2:2.12.0') include(implementation 'org.apache.commons:commons-pool2:2.12.0')
include(implementation 'org.lz4:lz4-java:1.8.0') include(implementation 'org.lz4:lz4-java:1.8.0')
include(implementation('org.tukaani:xz:1.10')) include(implementation('org.tukaani:xz:1.10'))

View File

@@ -107,6 +107,7 @@ public class VoxyClientInstance extends VoxyInstance {
} }
private static class Config { private static class Config {
public int version = 1;
public SectionStorageConfig sectionStorageConfig; public SectionStorageConfig sectionStorageConfig;
} }
private static final Config DEFAULT_STORAGE_CONFIG; private static final Config DEFAULT_STORAGE_CONFIG;

View File

@@ -28,7 +28,7 @@ public class VoxyConfig implements OptionStorage<VoxyConfig> {
public boolean enableRendering = true; public boolean enableRendering = true;
public boolean ingestEnabled = true; public boolean ingestEnabled = true;
public int sectionRenderDistance = 16; public int sectionRenderDistance = 16;
public int serviceThreads = Math.max(CpuLayout.CORES.length/2, 1); public int serviceThreads = (int) Math.max(CpuLayout.CORES.length/1.5, 1);
public float subDivisionSize = 64; public float subDivisionSize = 64;
public boolean renderVanillaFog = false; public boolean renderVanillaFog = false;
public boolean renderStatistics = false; public boolean renderStatistics = false;

View File

@@ -43,7 +43,7 @@ public class RenderGenerationService {
int unique = COUNTER.incrementAndGet(); int unique = COUNTER.incrementAndGet();
int lvl = WorldEngine.MAX_LOD_LAYER-WorldEngine.getLevel(this.position); int lvl = WorldEngine.MAX_LOD_LAYER-WorldEngine.getLevel(this.position);
lvl = Math.min(lvl, 3);//Make the 2 highest quality have equal priority lvl = Math.min(lvl, 3);//Make the 2 highest quality have equal priority
this.priority = (((lvl*3L + Math.min(this.attempts, 5))*2 + this.addin) <<32) + Integer.toUnsignedLong(unique); this.priority = (((lvl*3L + Math.min(this.attempts, 3))*2 + this.addin) <<32) + Integer.toUnsignedLong(unique);
this.addin = 0; this.addin = 0;
} }
} }
@@ -238,7 +238,7 @@ public class RenderGenerationService {
task.hasDoneModelRequestOuter = true; task.hasDoneModelRequestOuter = true;
} }
task.addin = WorldEngine.getLevel(task.position)>2?3:0;//Single time addin which gives the models time to bake before the task executes task.addin = WorldEngine.getLevel(task.position)>2?1:0;//Single time addin which gives the models time to bake before the task executes
} }
//Keep the lock on the section, and attach it to the task, this prevents needing to re-aquire it later //Keep the lock on the section, and attach it to the task, this prevents needing to re-aquire it later