Dev8

CHANGELOG.md

@@ -1,8 +1,8 @@
  == CHANGELOG ==
 
-**NOTE: This changelog is not maintained for prerelease versions**
+**NOTE: This changelog is not maintained for 2.0**
 
-You may view the changes since 1.1.3 here: https://github.com/jonwd7/nifskope/releases
+You may view the 2.0 changes here: https://github.com/hexabits/nifskope/releases
 
 
 This is version 1.1.3 of NifSkope.

NifSkope.pro

@@ -2,7 +2,7 @@
 ## BUILD OPTIONS
 ###############################
 
-TEMPLATE = app
+TEMPLATE = vcapp
 TARGET   = NifSkope
 
 QT += xml opengl network widgets
@@ -13,8 +13,8 @@ contains(QT_VERSION, ^5\\.[0-6]\\..*) {
 	error("Minimum required version is Qt 5.7")
 }
 
-# C++11/14 Support
-CONFIG += c++14
+# C++ Standard Support
+CONFIG += c++20
 
 # Dependencies
 CONFIG += nvtristrip qhull zlib lz4 fsengine gli
@@ -40,6 +40,7 @@ CONFIG(debug, debug|release) {
 
 # Require explicit
 DEFINES += \
+	_USE_MATH_DEFINES \ # Define M_PI, etc. in cmath
 	QT_NO_CAST_FROM_BYTEARRAY \ # QByteArray deprecations
 	QT_NO_URL_CAST_FROM_STRING \ # QUrl deprecations
 	QT_DISABLE_DEPRECATED_BEFORE=0x050300 #\ # Disable all functions deprecated as of 5.3
@@ -143,6 +144,7 @@ HEADERS += \
 	src/data/nifvalue.h \
 	src/gl/marker/constraints.h \
 	src/gl/marker/furniture.h \
+	srg/gl/BSMesh.h \
 	src/gl/bsshape.h \
 	src/gl/controllers.h \
 	src/gl/glcontroller.h \
@@ -152,12 +154,14 @@ HEADERS += \
 	src/gl/glparticles.h \
 	src/gl/glproperty.h \
 	src/gl/glscene.h \
+	src/gl/glshape.h \
 	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 \
 	src/io/nifstream.h \
 	src/lib/importex/3ds.h \
 	src/lib/nvtristripwrapper.h \
@@ -195,18 +199,26 @@ HEADERS += \
 	src/ui/settingsdialog.h \
 	src/ui/settingspane.h \
 	src/xml/nifexpr.h \
+	src/xml/xmlconfig.h \
+	src/gamemanager.h \
 	src/glview.h \
 	src/message.h \
 	src/nifskope.h \
 	src/spellbook.h \
 	src/version.h \
 	lib/dds.h \
 	lib/dxgiformat.h \
-	lib/half.h
+	lib/half.h \
+	lib/json.hpp \
+	lib/stb_image.h \
+	lib/stb_image_write.h \
+	lib/tiny_gltf.h
 
 SOURCES += \
+	src/data/nifitem.cpp \
 	src/data/niftypes.cpp \
 	src/data/nifvalue.cpp \
+	srg/gl/BSMesh.cpp \
 	src/gl/bsshape.cpp \
 	src/gl/controllers.cpp \
 	src/gl/glcontroller.cpp \
@@ -216,16 +228,19 @@ SOURCES += \
 	src/gl/glparticles.cpp \
 	src/gl/glproperty.cpp \
 	src/gl/glscene.cpp \
+	src/gl/glshape.cpp \
 	src/gl/gltex.cpp \
 	src/gl/gltexloaders.cpp \
 	src/gl/gltools.cpp \
 	src/gl/renderer.cpp \
 	src/io/material.cpp \
+	src/io/MeshFile.cpp \
 	src/io/nifstream.cpp \
 	src/lib/importex/3ds.cpp \
 	src/lib/importex/importex.cpp \
 	src/lib/importex/obj.cpp \
 	src/lib/importex/col.cpp \
+	src/lib/importex/gltf.cpp \
 	src/lib/nvtristripwrapper.cpp \
 	src/lib/qhull.cpp \
 	src/model/basemodel.cpp \
@@ -278,6 +293,7 @@ SOURCES += \
 	src/xml/kfmxml.cpp \
 	src/xml/nifexpr.cpp \
 	src/xml/nifxml.cpp \
+	src/gamemanager.cpp \
 	src/glview.cpp \
 	src/main.cpp \
 	src/message.cpp \
@@ -309,12 +325,10 @@ fsengine {
 	INCLUDEPATH += lib/fsengine
 	HEADERS += \
 		lib/fsengine/bsa.h \
-		lib/fsengine/fsengine.h \
-		lib/fsengine/fsmanager.h
+		lib/fsengine/fsengine.h
 	SOURCES += \
 		lib/fsengine/bsa.cpp \
-		lib/fsengine/fsengine.cpp \
-		lib/fsengine/fsmanager.cpp
+		lib/fsengine/fsengine.cpp
 }
 
 nvtristrip {
@@ -346,6 +360,9 @@ gli {
 }
 
 zlib {
+	macx {
+        DEFINES += Z_HAVE_UNISTD_H
+    }
     !*msvc*:QMAKE_CFLAGS += -isystem ../nifskope/lib/zlib
     !*msvc*:QMAKE_CXXFLAGS += -isystem ../nifskope/lib/zlib
     else:INCLUDEPATH += lib/zlib
@@ -406,7 +423,7 @@ win32 {
 
 	# Standards conformance to match GCC and clang
 	!isEmpty(_MSC_VER):greaterThan(_MSC_VER, 1900) {
-		QMAKE_CXXFLAGS += /permissive- /std:c++latest
+		QMAKE_CXXFLAGS += /permissive- /std:c++20
 	}
 
 	# LINKER FLAGS
@@ -430,8 +447,8 @@ win32 {
 	QMAKE_CXXFLAGS_DEBUG *= -Og -g3
 	QMAKE_CXXFLAGS_RELEASE *= -O3 -mfpmath=sse
 
-	# C++11 Support
-	QMAKE_CXXFLAGS_RELEASE *= -std=c++14
+	# C++ Standard Support
+	QMAKE_CXXFLAGS_RELEASE *= -std=c++20
 
 	#  Extension flags
 	QMAKE_CXXFLAGS_RELEASE *= -msse2 -msse
@@ -479,7 +496,7 @@ win32:contains(QT_ARCH, i386) {
 }
 
 	XML += \
-		build/docsys/nifxml/nif.xml \
+		build/nif.xml \
 		build/docsys/kfmxml/kfm.xml
 
 	QSS += \
@@ -494,7 +511,8 @@ win32:contains(QT_ARCH, i386) {
 	READMES += \
 		CHANGELOG.md \
 		LICENSE.md \
-		README.md
+		README.md \
+		README_GLTF.md
 
 	copyDirs( $$SHADERS, shaders )
 	#copyDirs( $$LANG, lang )
@@ -516,8 +534,12 @@ win32:contains(QT_ARCH, i386) {
 			$$[QT_INSTALL_PLUGINS]/imageformats/qtga$${DLLEXT} \
 			$$[QT_INSTALL_PLUGINS]/imageformats/qwebp$${DLLEXT}
 
+		styles += \
+			$$[QT_INSTALL_PLUGINS]/styles/qwindowsvistastyle$${DLLEXT}
+
 		copyFiles( $$platforms, platforms, true )
 		copyFiles( $$imageformats, imageformats, true )
+		copyFiles( $$styles, styles, true )
 	}
 
 } # end build_pass

NifSkope_functions.pri

@@ -30,18 +30,21 @@ defineReplace(getSed) {
 		SEDPATH = /sed.exe
 
 		exists($${GNUWIN32}$${SEDPATH}) {
-			sedbin = $${GNUWIN32}$${SEDPATH}
+			sedbin = $${GNUWIN32}$${QMAKE_DIR_SEP}
 		} else:exists($${CYGWIN}$${SEDPATH}) {
-			sedbin = $${CYGWIN}$${SEDPATH}
+			sedbin = $${CYGWIN}$${QMAKE_DIR_SEP}
 		} else:exists($${CYGWIN64}$${SEDPATH}) {
-			sedbin = $${CYGWIN64}$${SEDPATH}
+			sedbin = $${CYGWIN64}$${QMAKE_DIR_SEP}
 		} else {
 			#message(Neither GnuWin32 or Cygwin were found)
-			sedbin = $$system(where sed 2> NUL)
+			SEDSYS = $$system(where sed 2> NUL)
+			SEDLIST = $$split(SEDSYS, "sed.exe")
+			SEDBIN = $$member(SEDLIST, 0)
+			sedbin = $$syspath($${SEDBIN})
 		}
 
 		!isEmpty(sedbin) {
-			sedbin = \"$${sedbin}\"
+			sedbin = \"$${sedbin}sed.exe\"
 		}
 	}
 

README.md

@@ -1,20 +1,14 @@
-# NifSkope 2.0.dev7
+# NifSkope 2.0.dev9
 
-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, Fallout: New Vegas, Civilization IV, and more. 
+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. 
 
 ### Download
 
-You can download the latest official release from [GitHub](https://github.com/niftools/nifskope/releases). More frequent development builds are posted in the [NifTools Discord](https://discord.gg/ZFjdN4x), pinned to #software.
-
-
-### Discussion & Help
-
-- Visit the [NifTools Discord](https://discord.gg/ZFjdN4x). To receive support use the #software channel.
-- Visit the [NifTools.org](https://forum.niftools.org/) forum. To receive support for NifSkope please use the [Support subforum](https://forum.niftools.org/24-nifskope/).
+You can download the latest official release from [niftools/nifskope](https://github.com/niftools/nifskope/releases). More frequent development builds are posted at [hexabits/nifskope](https://github.com/hexabits/nifskope/releases).
 
 ### Issues
 
-Anyone can [report issues at GitHub](https://github.com/niftools/nifskope/issues) or in the NifTools.org [Support subforum](https://forum.niftools.org/24-nifskope/).
+Anyone can [report issues at GitHub](https://github.com/niftools/nifskope/issues).
 
 
 ### Contribute
@@ -27,15 +21,16 @@ git clone --recursive git://github.com/<YOUR_USERNAME>/nifskope.git
 
 For information about development:
 
-- Visit our [Discord #dev channel](https://discord.gg/zvWZrrJ).
-- Visit the NifTools.org [development subforum](https://forum.niftools.org/6-nifskope-development/).
 - Refer to our [GitHub wiki](https://github.com/niftools/nifskope/wiki#wiki-development) for information on compilation.  
 
 
 ### Miscellaneous
 
 Refer to these other documents in your installation folder or at the links provided:
 
+
+## [GLTF IMPORT/EXPORT](https://github.com/niftools/nifskope/blob/develop/README_GLTF.md)
+
 ## [TROUBLESHOOTING](https://github.com/niftools/nifskope/blob/develop/TROUBLESHOOTING.md)
 
 ## [CHANGELOG](https://github.com/niftools/nifskope/blob/develop/CHANGELOG.md)

README_GLTF.md

@@ -0,0 +1,44 @@
+# NifSkope glTF 2.0 Exporter v1.0
+
+# glTF Import
+
+glTF Import into NifSkope will be implemented in a subsequent release.
+
+# glTF Export
+
+glTF export is currently supported on static and skinned Starfield meshes. 
+
+To view and export Starfield meshes, you must first:
+
+1. Enable and add the path to your Starfield installation in Settings > Resources.
+2. Add the archives or extracted folders containing `geometries` to Archives or Paths in Settings > Resources, under Starfield.
+
+Skinned meshes currently require a small amount of setup before export. For the Blender glTF importer they require certain import options.
+
+## Skinned meshes
+
+### Pre-Export
+
+If the mesh does not have a skeleton with a `COM` or `COM_Twin` NiNode in its NIF, you need to:
+
+1. Open the skeleton.nif for that skinned mesh (e.g. `meshes\actors\human\characterassets\skeleton.nif`)
+2. Copy (Ctrl-C) the `COM` NiNode in skeleton.nif
+3. Paste (Ctrl-V) the entire `COM` branch onto the mesh NIF's root NiNode (0)
+4. Export to glTF
+
+In Starfield, this needs to be done for meshes skinned on the human skeleton.
+This does not need to be done for most creatures, as they come with a `COM_Twin` node.
+
+**Note:** This step will be more automated in the future.
+
+### Pre-Blender Import
+
+In the Blender glTF import window:
+
+1. Ensure "Guess Original Bind Pose" is **unchecked**.
+
+## Blender scripts
+
+Blender scripts are provided for use with glTF exports. They may be opened and run from the Scripting tab inside Blender.
+
+1. `gltf_lod_blender_script.py` is included in the `scripts` folder for managing LOD visibility in exported glTF.

build/README.md.in

@@ -1,20 +1,14 @@
 # NifSkope @VERSION@
 
-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, Fallout: New Vegas, Civilization IV, and more. 
+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. 
 
 ### Download
 
-You can download the latest official release from [GitHub](https://github.com/niftools/nifskope/releases). More frequent development builds are posted in the [NifTools Discord](https://discord.gg/ZFjdN4x), pinned to #software.
-
-
-### Discussion & Help
-
-- Visit the [NifTools Discord](https://discord.gg/ZFjdN4x). To receive support use the #software channel.
-- Visit the [NifTools.org](https://forum.niftools.org/) forum. To receive support for NifSkope please use the [Support subforum](https://forum.niftools.org/24-nifskope/).
+You can download the latest official release from [niftools/nifskope](https://github.com/niftools/nifskope/releases). More frequent development builds are posted at [hexabits/nifskope](https://github.com/hexabits/nifskope/releases).
 
 ### Issues
 
-Anyone can [report issues at GitHub](https://github.com/niftools/nifskope/issues) or in the NifTools.org [Support subforum](https://forum.niftools.org/24-nifskope/).
+Anyone can [report issues at GitHub](https://github.com/niftools/nifskope/issues).
 
 
 ### Contribute
@@ -27,15 +21,16 @@ git clone --recursive git://github.com/<YOUR_USERNAME>/nifskope.git
 
 For information about development:
 
-- Visit our [Discord #dev channel](https://discord.gg/zvWZrrJ).
-- Visit the NifTools.org [development subforum](https://forum.niftools.org/6-nifskope-development/).
 - Refer to our [GitHub wiki](https://github.com/niftools/nifskope/wiki#wiki-development) for information on compilation.  
 
 
 ### Miscellaneous
 
 Refer to these other documents in your installation folder or at the links provided:
 
+
+## [GLTF IMPORT/EXPORT](https://github.com/niftools/nifskope/blob/develop/README_GLTF.md)
+
 ## [TROUBLESHOOTING](https://github.com/niftools/nifskope/blob/develop/TROUBLESHOOTING.md)
 
 ## [CHANGELOG](https://github.com/niftools/nifskope/blob/develop/CHANGELOG.md)

build/VERSION

@@ -1 +1 @@
-2.0.dev7
+2.0.dev9