Changesets: DarkRadiant
master ab61972e 24.04.2019 22:20 Details Diff |
Add documentation of the new assets.lst functionality | ||
mod - doc/manual.adoc | Diff File | ||
mod - doc/manual.html | Diff File | ||
master 2eddbc8b 17.04.2019 21:54 Details Diff |
foreachShaderName() only visits visible shaders assets.lst handling now working for materials. Shader names returned by foreachShaderName() will no longer include shaders in MTR files listed as "hidden" in an assets.lst. Although this works at a file level, not an individual shader level, the required flexibility can still be achieved by moving all hidden shaders into a single MTR file (e.g. "tdm_hidden.mtr"). Just as with models, hidden shaders are not listed in the tree but still function correctly in the map itself. They will also still appear on the Textures tab, which lists materials in use not materials from the mod tree. |
||
mod - radiant/shaders/ShaderLibrary.cpp | Diff File | ||
master 235786cf 03.04.2019 21:48 Details Diff |
Check for null surface shader when iterating visible surfaces This was causing a crash when viewing a model in the model selector, although for some reason the crash only ever occurred during the first DarkRadiant session. |
||
mod - radiant/modelfile/RenderablePicoModel.cpp | Diff File | ||
master bd8c930b 03.04.2019 21:29 Details Diff |
Add tests and testdata for ShaderDefinition visibility Parsing of assets.lst is now working for shaders, with the visibility propagating to all shaders contained within a listed MTR file. |
||
add - radiant/test/data/vfs_root/materials/assets.lst | Diff File | ||
add - radiant/test/data/vfs_root/materials/hidden.mtr | Diff File | ||
mod - radiant/test/shadersTest.cpp | Diff File | ||
master 8b7b9f87 02.04.2019 21:59 Details Diff |
ShaderDefinition stores vfs::FileInfo not just filename Storing the vfs::FileInfo paves the way for associating vfs::Visibility information with shader definitions. |
||
mod - radiant/shaders/CShader.cpp | Diff File | ||
mod - radiant/shaders/ShaderDefinition.h | Diff File | ||
mod - radiant/shaders/ShaderFileLoader.h | Diff File | ||
mod - radiant/shaders/ShaderLibrary.cpp | Diff File | ||
mod - radiant/test/shadersTest.cpp | Diff File | ||
master afed9f8e 27.03.2019 21:59 Details Diff |
ShaderFileLoader walks the VFS in its constructor Since the ShaderFileLoader is taking a reference to the VFS anyway, it might as well kick off the call to forEachFile() by itself, rather than requiring calling code to set this up manually. This eliminates some duplicated code between DarkRadiant and shadersTest. |
||
mod - radiant/shaders/Doom3ShaderSystem.cpp | Diff File | ||
mod - radiant/shaders/ShaderFileLoader.h | Diff File | ||
mod - radiant/test/shadersTest.cpp | Diff File | ||
master bd0d5211 26.03.2019 21:58 Details Diff |
Simplify ShaderFileLoader path handling ShaderFileLoader no longer needs its own _basePath variable to reconstruct the path to the MTR file, since this is now available via FileInfo::fullPath(). This change in turn allows the shader file loading to behave the same with or without a trailing slash on the materials directory name. |
||
mod - radiant/shaders/Doom3ShaderSystem.cpp | Diff File | ||
mod - radiant/shaders/ShaderFileLoader.h | Diff File | ||
mod - radiant/test/shadersTest.cpp | Diff File | ||
master b818a38a 26.03.2019 21:24 Details Diff |
VirtualFileSystem::forEachFile no longer requires trailing slash on dir The previous code did not complain but silently broke if the basedir parameter did not include a trailing slash. Now we use standardPathWithSlash() within the method to avoid imposing this unexpected requirement on calling code. |
||
mod - include/ifilesystem.h | Diff File | ||
mod - radiant/test/shadersTest.cpp | Diff File | ||
mod - radiant/test/vfsTest.cpp | Diff File | ||
mod - radiant/vfs/Doom3FileSystem.cpp | Diff File | ||
master 43bf6f44 13.03.2019 21:53 Details Diff |
Add initial test for .mtr file parsing Collect ShaderDefinitions by name in the MockShaderLibrary, and assert that some of our example materials are present once ShaderFileLoader::parseFiles() has finished. |
||
mod - radiant/test/shadersTest.cpp | Diff File | ||
master 98e01bb3 13.03.2019 21:52 Details Diff |
Improve handling of 'srcdir' environment variable Throw a more meaningful exception if the srcdir variable is not set, rather than a construction error from inside std::string. |
||
mod - radiant/test/VFSFixture.h | Diff File | ||
master 7fa01ecc 12.03.2019 21:50 Details Diff |
ShaderFileLoader can now parseFiles() in unit tests Instead of calling GlobalFileSystem() directly, the ShaderFileLoader now takes a reference to the VirtualFileSystem in its constructor, so it can use the instance in the VFSFixture rather than crashing due to the lack of a module system. |
||
mod - radiant/shaders/Doom3ShaderSystem.cpp | Diff File | ||
mod - radiant/shaders/ShaderFileLoader.h | Diff File | ||
mod - radiant/test/shadersTest.cpp | Diff File | ||
master 17be980d 12.03.2019 21:36 Details Diff |
Add VFSFixture to shadersTest VFSFixture is now in a separate header file so it can be included by both vfsTest and shadersTest. |
||
mod - radiant/Makefile.am | Diff File | ||
add - radiant/test/VFSFixture.h | Diff File | ||
mod - radiant/test/shadersTest.cpp | Diff File | ||
mod - radiant/test/vfsTest.cpp | Diff File | ||
master 4f46db87 12.03.2019 21:06 Details Diff |
Split shaders unit tests into separate test binary Further refactoring will be needed to allow the shadersTest to make use of the VFSFixture for loading shader files from the VFS. |
||
mod - radiant/Makefile.am | Diff File | ||
mod - radiant/shaders/ShaderFileLoader.h | Diff File | ||
add - radiant/test/shadersTest.cpp | Diff File | ||
mod - radiant/test/vfsTest.cpp | Diff File | ||
master 653a9f7a 11.03.2019 06:36 Details Diff |
Fix 0004904 DarkRadiant's main window now respects the stored size and position plus the monitor it was displayed on at shutdown time. |
Affected Issues 0004904 |
|
mod - radiant/ui/mainframe/MainFrame.cpp | Diff File | ||
master 712f0d4e 11.03.2019 05:37 Details Diff |
Remember the monitor number the main window is displayed on before shutting down, try to restore everything on the next startup. | ||
mod - libs/wxutil/MultiMonitor.h | Diff File | ||
mod - radiant/ui/mainframe/MainFrame.cpp | Diff File | ||
master 4f9f5b3b 10.03.2019 08:27 Details Diff |
Fix 0004966: Reload Models option in Create Model dialog window doesn't update the model |
Affected Issues 0004966 |
|
mod - radiant/map/algorithm/Export.cpp | Diff File | ||
mod - radiant/map/algorithm/Models.cpp | Diff File | ||
mod - radiant/map/algorithm/Models.h | Diff File | ||
mod - radiant/model/ModelCache.cpp | Diff File | ||
mod - radiant/ui/modelselector/ModelSelector.cpp | Diff File | ||
master 06e6d35e 10.03.2019 07:14 Details Diff |
Fix issue 0004999: Problem with satisfying readable objective "when closed". Superfluous arguments were kept in the Component when switching types. |
Affected Issues 0004999 |
|
mod - plugins/dm.objectives/ce/AIFindBodyComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/AIFindItemComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/AlertComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/CustomClockedComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/CustomComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/DestroyComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/DistanceComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/InfoLocationComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/ItemComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/KillComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/KnockoutComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/LocationComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/PickpocketComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/ReadableClosedComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/ReadableOpenedComponentEditor.cpp | Diff File | ||
mod - plugins/dm.objectives/ce/ReadablePageReachedComponentEditor.cpp | Diff File | ||
master 047682dc 09.03.2019 08:26 Details Diff |
Adjust InnoSetup script to remove outdated DLL files before installation | ||
mod - tools/innosetup/darkradiant.iss | Diff File | ||
mod - tools/innosetup/darkradiant.x64.iss | Diff File | ||
master f3c69f92 09.03.2019 08:22 Details Diff |
Fix warning C4996, switch to using _stricmp instead of stricmp in VC++ | ||
mod - radiant/modelfile/picomodel/picointernal.h | Diff File | ||
master 8a5ed864 09.03.2019 08:19 Details Diff |
Adjust VC++ solution now that most modules reside within the main binary, remove all unused vcxproj files. Fix compilation in UIManager, since it was still using boost headers. Retarget the solution to Win10 SDK, not sure if this will cause problems with older OS versions. |
||
mod - radiant/uimanager/UIManager.cpp | Diff File | ||
mod - radiant/uimanager/UIManager.h | Diff File | ||
mod - radiant/vfs/Doom3FileSystemModule.cpp | Diff File | ||
mod - tools/msvc/DarkRadiant.sln | Diff File | ||
mod - tools/msvc/DarkRadiant.vcxproj | Diff File | ||
mod - tools/msvc/DarkRadiant.vcxproj.filters | Diff File | ||
rm - tools/msvc/archivezip.vcxproj | Diff | ||
rm - tools/msvc/archivezip.vcxproj.filters | Diff | ||
rm - tools/msvc/commandsystem.vcxproj | Diff | ||
rm - tools/msvc/commandsystem.vcxproj.filters | Diff | ||
rm - tools/msvc/ddslib.vcxproj | Diff | ||
mod - tools/msvc/dm.conversation.vcxproj | Diff File | ||
mod - tools/msvc/dm.difficulty.vcxproj | Diff File | ||
mod - tools/msvc/dm.editing.vcxproj | Diff File | ||
mod - tools/msvc/dm.gui.vcxproj | Diff File | ||
mod - tools/msvc/dm.objectives.vcxproj | Diff File | ||
mod - tools/msvc/dm.stimresponse.vcxproj | Diff File | ||
rm - tools/msvc/eclassmgr.vcxproj | Diff | ||
rm - tools/msvc/eclassmgr.vcxproj.filters | Diff | ||
rm - tools/msvc/entity.vcxproj | Diff | ||
rm - tools/msvc/entity.vcxproj.filters | Diff | ||
rm - tools/msvc/eventmanager.vcxproj | Diff | ||
rm - tools/msvc/eventmanager.vcxproj.filters | Diff | ||
rm - tools/msvc/filetypes.vcxproj | Diff | ||
rm - tools/msvc/filetypes.vcxproj.filters | Diff | ||
rm - tools/msvc/filters.vcxproj | Diff | ||
rm - tools/msvc/filters.vcxproj.filters | Diff | ||
rm - tools/msvc/fonts.vcxproj | Diff | ||
rm - tools/msvc/fonts.vcxproj.filters | Diff | ||
rm - tools/msvc/image.vcxproj | Diff | ||
rm - tools/msvc/image.vcxproj.filters | Diff | ||
mod - tools/msvc/include.vcxproj | Diff File | ||
mod - tools/msvc/libs.vcxproj | Diff File | ||
rm - tools/msvc/mapdoom3.vcxproj | Diff | ||
rm - tools/msvc/mapdoom3.vcxproj.filters | Diff | ||
mod - tools/msvc/mathlib.vcxproj | Diff File | ||
rm - tools/msvc/md5model.vcxproj | Diff | ||
rm - tools/msvc/md5model.vcxproj.filters | Diff | ||
rm - tools/msvc/model.vcxproj | Diff | ||
rm - tools/msvc/model.vcxproj.filters | Diff | ||
rm - tools/msvc/particles.vcxproj | Diff | ||
rm - tools/msvc/particles.vcxproj.filters | Diff | ||
rm - tools/msvc/picomodellib.vcxproj | Diff | ||
rm - tools/msvc/picomodellib.vcxproj.filters | Diff | ||
rm - tools/msvc/scenegraph.vcxproj | Diff | ||
rm - tools/msvc/scenegraph.vcxproj.filters | Diff | ||
mod - tools/msvc/scenelib.vcxproj | Diff File | ||
mod - tools/msvc/script.vcxproj | Diff File | ||
rm - tools/msvc/shaders.vcxproj | Diff | ||
rm - tools/msvc/shaders.vcxproj.filters | Diff | ||
rm - tools/msvc/skins.vcxproj | Diff | ||
rm - tools/msvc/skins.vcxproj.filters | Diff | ||
mod - tools/msvc/sound.vcxproj | Diff File | ||
rm - tools/msvc/uimanager.vcxproj | Diff | ||
rm - tools/msvc/uimanager.vcxproj.filters | Diff | ||
rm - tools/msvc/vfspk3.vcxproj | Diff | ||
rm - tools/msvc/vfspk3.vcxproj.filters | Diff | ||
rm - tools/msvc/wavefront.vcxproj | Diff | ||
rm - tools/msvc/wavefront.vcxproj.filters | Diff | ||
mod - tools/msvc/wxutillib.vcxproj | Diff File | ||
rm - tools/msvc/xmlregistry.vcxproj | Diff | ||
rm - tools/msvc/xmlregistry.vcxproj.filters | Diff | ||
mod - tools/msvc/xmlutillib.vcxproj | Diff File | ||
master 609ed5c9 09.03.2019 07:08 Details Diff |
Merge remote-tracking branch 'orbweaver/master' # Conflicts: # radiant/ui/lightinspector/LightInspector.cpp |
||
add - .gitlab-ci.yml | Diff File | ||
mod - Makefile.am | Diff File | ||
mod - configure.ac | Diff File | ||
mod - debian/changelog | Diff File | ||
mod - debian/control | Diff File | ||
mod - debian/darkradiant.install | Diff File | ||
rm - depcomp | Diff | ||
add - doc/Makefile.am | Diff File | ||
add - doc/img/2DViewMarkedUp.png | Diff File | ||
add - doc/img/6Cone.png | Diff File | ||
add - doc/img/6Prism.png | Diff File | ||
add - doc/img/6Sphere.png | Diff File | ||
add - doc/img/BlackGreenTheme.png | Diff File | ||
add - doc/img/ClipTool3D.png | Diff File | ||
add - doc/img/CreateRoom.png | Diff File | ||
add - doc/img/CreateRoomBrush.png | Diff File | ||
add - doc/img/DarkRadiantDefaultTheme.png | Diff File | ||
add - doc/img/DarkRadiantWorkflow.png | Diff File | ||
add - doc/img/EdgeEditing.png | Diff File | ||
add - doc/img/EntityClassSelector.png | Diff File | ||
add - doc/img/EntityInspector.png | Diff File | ||
add - doc/img/GameSetupDialog.png | Diff File | ||
add - doc/img/Hollow.png | Diff File | ||
add - doc/img/HollowBrush.png | Diff File | ||
add - doc/img/LayersWindow.png | Diff File | ||
add - doc/img/LightInTwoLayers.png | Diff File | ||
add - doc/img/LightInspector.png | Diff File | ||
add - doc/img/LightSelectedAndUnselected.png | Diff File | ||
add - doc/img/MayaEmulationTheme.png | Diff File | ||
add - doc/img/MediaTab.png | Diff File | ||
add - doc/img/ModelSelector.png | Diff File | ||
add - doc/img/PatchBevel.png | Diff File | ||
add - doc/img/PatchCone.png | Diff File | ||
add - doc/img/PatchCylinder.png | Diff File | ||
add - doc/img/PatchEndCap.png | Diff File | ||
add - doc/img/PatchSphere.png | Diff File | ||
add - doc/img/PatchSubdivision.png | Diff File | ||
add - doc/img/PatchVertexEditing.png | Diff File | ||
add - doc/img/Pointfile.png | Diff File | ||
add - doc/img/PrefabChooser.png | Diff File | ||
add - doc/img/Q3RadiantTheme.png | Diff File | ||
add - doc/img/SelectCompleteTall.png | Diff File | ||
add - doc/img/SelectInside.png | Diff File | ||
add - doc/img/SelectTouching.png | Diff File | ||
add - doc/img/SimplePatchesControlPoints.png | Diff File | ||
add - doc/img/StartPlayback.png | Diff File | ||
add - doc/img/StopPlayback.png | Diff File | ||
add - doc/img/SuperMalTheme.png | Diff File | ||
add - doc/img/SurfaceInspector.png | Diff File | ||
add - doc/img/TexturesTab.png | Diff File | ||
add - doc/img/caution.png | Diff File | ||
add - doc/img/dragresize_symm.png | Diff File | ||
add - doc/img/example.png | Diff File | ||
add - doc/img/farClipIn.png | Diff File | ||
add - doc/img/farClipOut.png | Diff File | ||
add - doc/img/home.png | Diff File | ||
add - doc/img/important.png | Diff File | ||
add - doc/img/lightingMode.png | Diff File | ||
add - doc/img/next.png | Diff File | ||
add - doc/img/note.png | Diff File | ||
add - doc/img/prev.png | Diff File | ||
add - doc/img/solidMode16.png | Diff File | ||
add - doc/img/textureMode16.png | Diff File | ||
add - doc/img/tip.png | Diff File | ||
add - doc/img/up.png | Diff File | ||
add - doc/img/view_show_lightradii.png | Diff File | ||
add - doc/img/warning.png | Diff File | ||
add - doc/img/wireframeMode16.png | Diff File | ||
add - doc/imgsrc/2DView.png | Diff File | ||
add - doc/imgsrc/2DViewMarkedUp.svg | Diff File | ||
add - doc/imgsrc/DarkRadiantWorkflow.svg | Diff File | ||
add - doc/manual.adoc | Diff File | ||
add - doc/manual.css | Diff File | ||
add - doc/manual.html | Diff File | ||
mod - include/iarchive.h | Diff File | ||
mod - include/ifilesystem.h | Diff File | ||
mod - include/imodule.h | Diff File | ||
mod - include/iradiant.h | Diff File | ||
mod - install/menu.xml | Diff File | ||
mod - install/ui/lightinspector.fbp | Diff File | ||
mod - install/ui/lightinspector.xrc | Diff File | ||
mod - libs/Makefile.am | Diff File | ||
rm - libs/ddslib/Makefile.am | Diff | ||
rm - libs/picomodel/Makefile.am | Diff | ||
add - man/Makefile | Diff File | ||
mod - man/darkradiant.1 | Diff File | ||
add - man/darkradiant.adoc | Diff File | ||
mod - plugins/Makefile.am | Diff File | ||
rm - plugins/archivezip/Makefile.am | Diff | ||
rm - plugins/archivezip/plugin.cpp | Diff | ||
rm - plugins/commandsystem/Makefile.am | Diff | ||
mod - plugins/dm.gui/XDataLoader.cpp | Diff File | ||
mod - plugins/dm.gui/gui/GuiManager.cpp | Diff File | ||
rm - plugins/eclassmgr/Makefile.am | Diff | ||
rm - plugins/eclassmgr/eclass_doom3.cpp | Diff | ||
rm - plugins/entity/Makefile.am | Diff | ||
rm - plugins/entity/plugin.cpp | Diff | ||
rm - plugins/entity/plugin.h | Diff | ||
rm - plugins/eventmanager/Makefile.am | Diff | ||
rm - plugins/filetypes/Makefile.am | Diff | ||
rm - plugins/filters/Makefile.am | Diff | ||
rm - plugins/filters/filters.cpp | Diff | ||
rm - plugins/fonts/Makefile.am | Diff | ||
rm - plugins/fonts/plugin.cpp | Diff | ||
rm - plugins/image/Makefile.am | Diff | ||
rm - plugins/image/image.cpp | Diff | ||
rm - plugins/mapdoom3/Makefile.am | Diff | ||
rm - plugins/mapdoom3/mapdoom3.cpp | Diff | ||
rm - plugins/md5model/Makefile.am | Diff | ||
rm - plugins/model/plugin.cpp | Diff | ||
rm - plugins/model/plugin.h | Diff | ||
rm - plugins/particles/Makefile.am | Diff | ||
rm - plugins/particles/particles.cpp | Diff | ||
rm - plugins/scenegraph/Makefile.am | Diff | ||
mod - plugins/script/interfaces/FileSystemInterface.cpp | Diff File | ||
rm - plugins/shaders/Doom3ShaderSystem.cpp | Diff | ||
rm - plugins/shaders/Makefile.am | Diff | ||
rm - plugins/shaders/ShaderFileLoader.cpp | Diff | ||
rm - plugins/shaders/ShaderFileLoader.h | Diff | ||
rm - plugins/shaders/plugin.cpp | Diff | ||
rm - plugins/skins/skincache.cpp | Diff | ||
mod - plugins/sound/SoundManager.cpp | Diff File | ||
rm - plugins/uimanager/Makefile.am | Diff | ||
rm - plugins/vfspk3/ArchiveVisitor.h | Diff | ||
rm - plugins/vfspk3/Doom3FileSystem.cpp | Diff | ||
rm - plugins/vfspk3/FileVisitor.h | Diff | ||
rm - plugins/vfspk3/Makefile.am | Diff | ||
rm - plugins/vfspk3/vfspk3.cpp | Diff | ||
rm - plugins/vfspk3/vfspk3.h | Diff | ||
rm - plugins/xmlregistry/Makefile.am | Diff | ||
rm - plugins/xmlregistry/XMLRegistryModule.cpp | Diff | ||
mod - radiant/Makefile.am | Diff File | ||
mod - radiant/RadiantApp.cpp | Diff File | ||
mod - radiant/RadiantModule.cpp | Diff File | ||
mod - radiant/RadiantModule.h | Diff File | ||
master 27bc419e 07.03.2019 22:24 Details Diff |
Remove depcomp from source tree This is another local script generated by autogen.sh so we don't need it in source control. |
||
rm - depcomp | Diff | ||
master 26a840a5 07.03.2019 22:21 Details Diff |
Add more dependencies of ShaderFileLoader into unit test Actually calling the parseFiles() method generates code which requires additional dependencies. Some of these are added as .cpp files in the Makefile, while the call to GetTextureManager() is linked to a local implementation so we can avoid depending on the modulesystem. |
||
mod - radiant/Makefile.am | Diff File | ||
mod - radiant/test/vfsTest.cpp | Diff File | ||
master 68e65988 07.03.2019 22:07 Details Diff |
Split ShaderFileLoader out for testing ShaderFileLoader is now in its own header, with a template parameter specifying the ShaderLibrary class which can be mocked in tests. ShaderFileLoader can now be instantiated in unit tests but does not yet do anything interesting. |
||
mod - radiant/shaders/Doom3ShaderSystem.cpp | Diff File | ||
add - radiant/shaders/ShaderFileLoader.h | Diff File | ||
mod - radiant/test/vfsTest.cpp | Diff File | ||
master 80b8e910 05.03.2019 22:00 Details Diff |
Add fullPath() method to vfs::FileInfo vfs::FileInfo now stores both the file name (including relative directories) and the top-level containing directory, so the full mod path can be reconstructed if required by calling the new fullPath() method. Added another small test PK4 into the test/data/vfs_root directory, containing a few TDM material files for testing this functionality. |
||
mod - include/ifilesystem.h | Diff File | ||
add - radiant/test/data/vfs_root/tdm_example_mtrs.pk4 | Diff File | ||
mod - radiant/test/vfsTest.cpp | Diff File | ||
mod - radiant/vfs/Doom3FileSystem.cpp | Diff File |