VOXEDIT: disable normal rendering in non-c&c mode

also ensure that the 6bit palettes are loading in c&c mode should fix the last issue for #519
vengi-voxel · Oct 22, 2024 · 7d9af31 · 7d9af31
1 parent 2af7c05
commit 7d9af31
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/tools/voxedit/modules/voxedit-ui/MainWindow.cpp b/src/tools/voxedit/modules/voxedit-ui/MainWindow.cpp
@@ -271,6 +271,9 @@ bool MainWindow::init() {
 		_modelNodeSettings.reset();
 		region = _modelNodeSettings.region();
 	}
+
+	updateViewMode();
+
 	if (!_sceneMgr->newScene(true, _modelNodeSettings.name, region)) {
 		return false;
 	}
@@ -957,15 +960,21 @@ QuitDisallowReason MainWindow::allowToQuit() {
 	return QuitDisallowReason::None;
 }
 
+void MainWindow::updateViewMode() {
+	if (_viewMode->intVal() == (int)ViewMode::CommandAndConquer) {
+		core::Var::getSafe(cfg::PalformatRGB6Bit)->setVal(true);
+	} else {
+		core::Var::getSafe(cfg::RenderNormals)->setVal(false);
+	}
+}
+
 void MainWindow::update() {
 	core_trace_scoped(MainWindow);
 	if (_viewMode->isDirty() || _numViewports->isDirty()) {
 		if (!initScenes()) {
 			Log::error("Failed to update scenes");
 		}
-		if (_viewMode->intVal() != (int)ViewMode::CommandAndConquer) {
-			core::Var::getSafe(cfg::RenderNormals)->setVal(false);
-		}
+		updateViewMode();
 	}
 
 	ImGuiViewport *viewport = ImGui::GetMainViewport();

diff --git a/src/tools/voxedit/modules/voxedit-ui/MainWindow.h b/src/tools/voxedit/modules/voxedit-ui/MainWindow.h
@@ -140,6 +140,7 @@ class MainWindow : public ui::Panel {
 	void popupVolumeSplit();
 	void registerPopups();
 	void addTemplate(const TemplateModel &model);
+	void updateViewMode();
 public:
 	MainWindow(ui::IMGUIApp *app, const SceneManagerPtr &sceneMgr, const video::TexturePoolPtr &texturePool,
 			   const voxelcollection::CollectionManagerPtr &collectionMgr, const io::FilesystemPtr &filesystem);