My changes since 2023-09-24

NifSkope.pro

@@ -2,8 +2,12 @@
 ## BUILD OPTIONS
 ###############################
 
-TEMPLATE = vcapp
-TARGET   = NifSkope
+*msvc* {
+	TEMPLATE = vcapp
+} else {
+	TEMPLATE = app
+}
+TARGET = NifSkope
 
 QT += xml opengl network widgets
 
@@ -82,24 +86,6 @@ VISUALSTUDIO = false
 include(NifSkope_functions.pri)
 
 
-###############################
-## MACROS
-###############################
-
-# NifSkope Version
-VER = $$getVersion()
-# NifSkope Revision
-REVISION = $$getRevision()
-
-# NIFSKOPE_VERSION macro
-DEFINES += NIFSKOPE_VERSION=\\\"$${VER}\\\"
-
-# NIFSKOPE_REVISION macro
-!isEmpty(REVISION) {
-	DEFINES += NIFSKOPE_REVISION=\\\"$${REVISION}\\\"
-}
-
-
 ###############################
 ## OUTPUT DIRECTORIES
 ###############################
@@ -147,6 +133,7 @@ HEADERS += \
 	src/gl/BSMesh.h \
 	src/gl/bsshape.h \
 	src/gl/controllers.h \
+	src/gl/glcontrollable.h \
 	src/gl/glcontroller.h \
 	src/gl/glmarker.h \
 	src/gl/glmesh.h \
@@ -158,7 +145,6 @@ HEADERS += \
 	src/gl/gltex.h \
 	src/gl/gltexloaders.h \
 	src/gl/gltools.h \
-	src/gl/icontrollable.h \
 	src/gl/renderer.h \
 	src/io/material.h \
 	src/io/MeshFile.h \
@@ -198,6 +184,8 @@ HEADERS += \
 	src/ui/checkablemessagebox.h \
 	src/ui/settingsdialog.h \
 	src/ui/settingspane.h \
+	src/ui/ToolDialog.h \
+	src/ui/UiUtils.h \
 	src/xml/nifexpr.h \
 	src/xml/xmlconfig.h \
 	src/gamemanager.h \
@@ -212,7 +200,8 @@ HEADERS += \
 	lib/json.hpp \
 	lib/stb_image.h \
 	lib/stb_image_write.h \
-	lib/tiny_gltf.h
+	lib/tiny_gltf.h \
+	lib/Miniball.hpp
 
 SOURCES += \
 	src/data/nifitem.cpp \
@@ -221,6 +210,7 @@ SOURCES += \
 	src/gl/BSMesh.cpp \
 	src/gl/bsshape.cpp \
 	src/gl/controllers.cpp \
+	src/gl/glcontrollable.cpp \
 	src/gl/glcontroller.cpp \
 	src/gl/glmarker.cpp \
 	src/gl/glmesh.cpp \
@@ -290,6 +280,8 @@ SOURCES += \
 	src/ui/checkablemessagebox.cpp \
 	src/ui/settingsdialog.cpp \
 	src/ui/settingspane.cpp \
+	src/ui/ToolDialog.cpp \
+	src/ui/UiUtils.cpp \
 	src/xml/kfmxml.cpp \
 	src/xml/nifexpr.cpp \
 	src/xml/nifxml.cpp \
@@ -300,14 +292,12 @@ SOURCES += \
 	src/nifskope.cpp \
 	src/nifskope_ui.cpp \
 	src/spellbook.cpp \
-	src/version.cpp \
 	lib/half.cpp
 
 RESOURCES += \
 	res/nifskope.qrc
 
 FORMS += \
-	src/ui/about_dialog.ui \
 	src/ui/checkablemessagebox.ui \
 	src/ui/nifskope.ui \
 	src/ui/settingsdialog.ui \
@@ -362,6 +352,7 @@ gli {
 zlib {
 	macx {
         DEFINES += Z_HAVE_UNISTD_H
+        QMAKE_CFLAGS += -fno-define-target-os-macros
     }
     !*msvc*:QMAKE_CFLAGS += -isystem ../nifskope/lib/zlib
     !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/zlib
@@ -436,9 +427,9 @@ win32 {
 }
 
 
-# MinGW, GCC
+# MinGW, GCC, clang
 #  Recommended: GCC 4.8.1+
-*-g++ {
+*-g++|*-clang {
 
 	# COMPILER FLAGS
 
@@ -471,20 +462,6 @@ macx {
 # Pre/Post Link in build_pass only
 build_pass|!debug_and_release {
 
-###############################
-## QMAKE_PRE_LINK
-###############################
-
-	# Find `sed` command
-	SED = $$getSed()
-
-	!isEmpty(SED) {
-		# Replace @VERSION@ with number from build/VERSION
-		# Copy build/README.md.in > README.md
-		QMAKE_PRE_LINK += $${SED} -e s/@VERSION@/$${VER}/ $${PWD}/build/README.md.in > $${PWD}/README.md $$nt
-	}
-
-
 ###############################
 ## QMAKE_POST_LINK
 ###############################
@@ -514,9 +491,12 @@ win32:contains(QT_ARCH, i386) {
 		README.md \
 		README_GLTF.md
 
+	CONFIGS += \
+		build/qt.conf
+
 	copyDirs( $$SHADERS, shaders )
 	#copyDirs( $$LANG, lang )
-	copyFiles( $$XML $$QSS )
+	copyFiles( $$XML $$QSS $$CONFIGS )
 
 	# Copy Readmes and rename to TXT
 	copyFiles( $$READMES,,,, md:txt )

NifSkope_functions.pri

@@ -80,52 +80,6 @@ defineReplace(get7z) {
 }
 
 
-_VERSION =
-_REVISION =
-
-# Retrieve NifSkope version
-defineReplace(getVersion) {
-	# I turned this into a function because I didn't want
-	# the Version/Revision macros to have to straddle the
-	# includes. (VERSION needed to come before, REVISION after)
-	!isEmpty(_VERSION):return($$_VERSION)
-
-	_VERSION = $$cat(build/VERSION)
-	export(_VERSION)
-	return($$_VERSION)
-}
-
-# Retrieve NifSkope revision
-defineReplace(getRevision) {
-
-	!isEmpty(_REVISION):return($$_REVISION)
-
-	GIT_HEAD = $$cat(.git/HEAD)
-	# At this point GIT_HEAD either contains commit hash, or symbolic ref:
-	#	GIT_HEAD = 303c05416ecceb3368997c86676a6e63e968bc9b
-	#	GIT_HEAD = ref: refs/head/feature/blabla
-	contains(GIT_HEAD, "ref:") {
-		# Resolve symbolic ref
-		GIT_HEAD = .git/$$member(GIT_HEAD, 1)
-		# GIT_HEAD now points to the file containing hash,
-		#	e.g. .git/refs/head/feature/blabla
-		exists($$GIT_HEAD) {
-			GIT_HEAD = $$cat($$GIT_HEAD)
-		} else {
-			clear(GIT_HEAD)
-		}
-	}
-	count(GIT_HEAD, 1) {
-		# Single component, hopefully the commit hash
-		# Fetch first seven characters (abbreviated hash)
-		GIT_HEAD ~= s/^(.......).*/\\1/
-		_REVISION = $$GIT_HEAD
-		export(_REVISION)
-		return($$_REVISION)
-	}
-	return()
-}
-
 # Format Qt Version
 defineReplace(QtHex) {
 

NifSkope_targets.pri

@@ -138,9 +138,7 @@ SED = $$getSed()
     unix:doxygen.commands += $${_7z} -o $${TAGS}$${QMAKE_DIR_SEP}tags.zip -d $${TAGS} $$nt
 }
 
-doxygen.commands += $${SED} -e \"s%@VERSION@%$$getVersion()%g;\
-                                 s%@REVISION@%$$getRevision()%g;\
-                                 s%@OUTPUT@%$${OUTPUT}%g;\
+doxygen.commands += $${SED} -e \"s%@OUTPUT@%$${OUTPUT}%g;\
                                  s%@INPUT@%$${INPUT}%g;\
                                  s%@PWD@%$${ROOT}%g;\
                                  s%@QT_VER@%$$QtHex()%g;\

README.md

@@ -1,4 +1,4 @@
-# NifSkope 2.0.dev9
+# NifSkope 2.0 Dev 9d (Gavrant)
 
 NifSkope is a tool for opening and editing the NetImmerse file format (NIF). NIF is used by video games such as Morrowind, Oblivion, Skyrim, Fallout 3/NV/4/76, Starfield, Civilization IV, and more. 
 

build/doxygen/Doxyfile.in

@@ -1987,8 +1987,6 @@ PREDEFINED             = UNICODE \
                          QT_NO_DEBUG \
                          Q_OS_WIN \
                          Q_OS_WIN32 \
-                         "NIFSKOPE_VERSION=\"@VERSION@\"" \
-                         "NIFSKOPE_REVISION=\"@REVISION@\"" \
                          "QT_VERSION=@QT_VER@"
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this