Changesets: DarkRadiant

master c9e63498

05.03.2021 03:54

greebo


Details Diff
Fix the code from the latest PR: getMaterialForName => getMaterial
mod - radiantcore/map/format/primitiveparsers/BrushDef.cpp Diff File

master e6e4c883

05.03.2021 03:52

greebo


Details Diff
Restore the string_compare_nocase_n functor removed in fc363e0, which is needed by the Win32 code in os/path.h
mod - libs/string/string.h Diff File

master faafc127

05.03.2021 03:52

greebo


Details Diff
Adjust VC++ projects
mod - tools/msvc/DarkRadiant.vcxproj Diff File
mod - tools/msvc/DarkRadiant.vcxproj.filters Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj.filters Diff File
mod - tools/msvc/Tests/Tests.vcxproj Diff File
mod - tools/msvc/Tests/Tests.vcxproj.filters Diff File

master b1a35f1a

05.03.2021 03:42

greebo


Details Diff
Merge remote-tracking branch 'remotes/orbweaver/master'
mod - CMakeLists.txt Diff File
mod - include/ShaderLayer.h Diff File
mod - include/ieclass.h Diff File
mod - include/ieclasscolours.h Diff File
mod - include/ishaders.h Diff File
mod - libs/eclass.h Diff File
mod - libs/registry/CachedKey.h Diff File
mod - libs/shaderlib.h Diff File
mod - libs/string/string.h Diff File
mod - libs/wxutil/dialog/DialogBase.cpp Diff File
mod - libs/wxutil/dialog/DialogBase.h Diff File
mod - libs/wxutil/preview/GuiRenderer.cpp Diff File
mod - plugins/dm.stimresponse/SREntity.cpp Diff File
mod - plugins/dm.stimresponse/SRPropertyLoader.cpp Diff File
mod - plugins/dm.stimresponse/SRPropertyLoader.h Diff File
mod - plugins/script/interfaces/EClassInterface.cpp Diff File
mod - plugins/script/interfaces/ShaderSystemInterface.cpp Diff File
mod - radiant/CMakeLists.txt Diff File
mod - radiant/textool/TexTool.cpp Diff File
mod - radiant/ui/common/MaterialDefinitionView.cpp Diff File
mod - radiant/ui/common/ShaderSelector.cpp Diff File
mod - radiant/ui/common/TexturePreviewCombo.cpp Diff File
mod - radiant/ui/eclasstree/EClassTree.cpp Diff File
mod - radiant/ui/eclasstree/EClassTree.h Diff File
mod - radiant/ui/eclasstree/EClassTreeBuilder.cpp Diff File
mod - radiant/ui/einspector/AddPropertyDialog.cpp Diff File
mod - radiant/ui/einspector/EntityInspector.cpp Diff File
mod - radiant/ui/einspector/EntityInspector.h Diff File
add - radiant/ui/mainframe/AuiLayout.cpp Diff File
add - radiant/ui/mainframe/AuiLayout.h Diff File
mod - radiant/ui/mainframe/MainFrame.cpp Diff File
mod - radiant/ui/mainframe/MainFrameLayoutManager.cpp Diff File
mod - radiant/ui/mediabrowser/MediaBrowserTreeView.cpp Diff File
mod - radiant/ui/mediabrowser/TextureDirectoryLoader.h Diff File
mod - radiantcore/CMakeLists.txt Diff File
rm - radiantcore/commandsystem/CaseInsensitiveCompare.h Diff
mod - radiantcore/commandsystem/CommandSystem.h Diff File
mod - radiantcore/eclass/EClassColourManager.cpp Diff File
mod - radiantcore/eclass/EClassColourManager.h Diff File
mod - radiantcore/eclass/EClassManager.cpp Diff File
mod - radiantcore/eclass/EClassManager.h Diff File
mod - radiantcore/entity/EntityModule.cpp Diff File
mod - radiantcore/entity/KeyObserverMap.h Diff File
mod - radiantcore/entity/SpawnArgs.cpp Diff File
mod - radiantcore/entity/light/LightNode.cpp Diff File
mod - radiantcore/entity/light/LightNode.h Diff File
mod - radiantcore/model/export/WavefrontExporter.cpp Diff File
mod - radiantcore/rendersystem/backend/OpenGLShader.cpp Diff File
mod - radiantcore/shaders/CShader.cpp Diff File
mod - radiantcore/shaders/CShader.h Diff File
mod - radiantcore/shaders/Doom3ShaderSystem.cpp Diff File
mod - radiantcore/shaders/Doom3ShaderSystem.h Diff File
mod - radiantcore/shaders/ShaderDefinition.h Diff File
mod - radiantcore/shaders/ShaderLibrary.h Diff File
rm - radiantcore/shaders/ShaderNameCompareFunctor.h Diff
add - test/Basic.cpp Diff File
mod - test/CMakeLists.txt Diff File
mod - test/Entity.cpp Diff File
mod - test/Materials.cpp Diff File
mod - test/Selection.cpp Diff File
add - test/resources/tdm/lights/squarelight1_amb.tga Diff File
add - test/resources/tdm/lights/squarelight1a.tga Diff File
add - test/resources/tdm/materials/lights.mtr Diff File

master 577dd661

04.03.2021 20:59

orbweaver


Details Diff
Rename getMaterialForName() to getMaterial()
mod - include/ishaders.h Diff File
mod - libs/wxutil/preview/GuiRenderer.cpp Diff File
mod - plugins/script/interfaces/ShaderSystemInterface.cpp Diff File
mod - radiant/textool/TexTool.cpp Diff File
mod - radiant/ui/common/MaterialDefinitionView.cpp Diff File
mod - radiant/ui/common/ShaderSelector.cpp Diff File
mod - radiant/ui/common/TexturePreviewCombo.cpp Diff File
mod - radiant/ui/mediabrowser/TextureDirectoryLoader.h Diff File
mod - radiantcore/model/export/WavefrontExporter.cpp Diff File
mod - radiantcore/rendersystem/backend/OpenGLShader.cpp Diff File
mod - radiantcore/shaders/CShader.cpp Diff File
mod - radiantcore/shaders/Doom3ShaderSystem.cpp Diff File
mod - radiantcore/shaders/Doom3ShaderSystem.h Diff File
mod - test/Materials.cpp Diff File
mod - test/Selection.cpp Diff File

master 1646df29

04.03.2021 20:44

orbweaver


Details Diff
Add a test for parsing ambient light definition

Add test data defining an ambient light and a point light in .mtr files (data
largely copied from the main TDM tree but with scaled-down TGAs to save space)
and confirm that isAmbientLight() is set appropriately in both cases.
mod - test/Materials.cpp Diff File
add - test/resources/tdm/lights/squarelight1_amb.tga Diff File
add - test/resources/tdm/lights/squarelight1a.tga Diff File
add - test/resources/tdm/materials/lights.mtr Diff File

master fc363e02

03.03.2021 21:07

orbweaver


Details Diff
Rename string_compare_nocase to string::icmp
mod - libs/shaderlib.h Diff File
mod - libs/string/string.h Diff File
mod - test/Basic.cpp Diff File

master 258ad421

03.03.2021 20:34

orbweaver


Details Diff
Add a string::ILess functor for case-insensitive containers

Replace about 8 separate implementations of a std::less functor using
string_compare_nocase() with a single functor defined in string.h itself.

This is covered by tests in a new BasicTest suite which can be used for testing
simple core functions which do not require the construction of a complete
Radiant environment.
mod - libs/string/string.h Diff File
mod - radiant/ui/einspector/EntityInspector.h Diff File
mod - radiant/ui/mediabrowser/MediaBrowserTreeView.cpp Diff File
rm - radiantcore/commandsystem/CaseInsensitiveCompare.h Diff
mod - radiantcore/commandsystem/CommandSystem.h Diff File
mod - radiantcore/eclass/EntityClass.h Diff File
mod - radiantcore/entity/KeyObserverMap.h Diff File
mod - radiantcore/shaders/ShaderDefinition.h Diff File
mod - radiantcore/shaders/ShaderLibrary.h Diff File
rm - radiantcore/shaders/ShaderNameCompareFunctor.h Diff
add - test/Basic.cpp Diff File
mod - test/CMakeLists.txt Diff File

master acc606cc

03.03.2021 20:14

orbweaver


Details Diff
Remove string sharing mechanism from EntityClassAttribute

Sharing of strings was added to solve a specific problem with memory usage when
attributes (including those with long strings like editor_usage) were copied
into hundreds of child entities. Since we are no longer copying inherited
attributes but allowing children to access them directly, this mechanism is
largely redundant.

There might be a *slight* increase in memory usage (compared to the previous
commit) now that the EntityAttributeMap is storing name strings twice (once in
the key, and once in the EntityClassAttribute::_name member), but I assume this
is OK since the overall number of EntityClassAttributes is drastically reduced
due to the lack of copying, and the lengthy editor_usage values are not
duplicated.
mod - include/ieclass.h Diff File
mod - radiantcore/eclass/EntityClass.cpp Diff File
mod - radiantcore/eclass/EntityClass.h Diff File

master e31aed27

03.03.2021 14:51

greebo

Committer: GitHub


Details Diff
0005556: Merge pull request 0000015 from illwieckz/q3legacybrush

Add missing image dimension reads to Quake 3 legacy brush parser
Affected Issues
0000015, 0005556
mod - radiantcore/map/format/primitiveparsers/BrushDef.cpp Diff File
mod - radiantcore/map/format/primitiveparsers/BrushDef.h Diff File

master 260e8765

03.03.2021 06:48

illwieckz


Details Diff
Add missing image dimension reads to Quake 3 legacy brush parser

I believe there is no exporter for that brush format so that would mean the
Q3 legacy brushes would be converted to Q3 non-legacy brushes on write,
if there is no bug on the writing part. That other brush format is compatible
with NetRadiant and the q3map2 map compiler so that would not be a big issue.

See that thread for work-in-progress status with the Q3-map based Unvanquished game:

- https://forums.unvanquished.net/viewtopic.php?f=9&t=2121
mod - radiantcore/map/format/primitiveparsers/BrushDef.cpp Diff File
mod - radiantcore/map/format/primitiveparsers/BrushDef.h Diff File

master 7dbe8cfb

01.03.2021 20:54

orbweaver


Details Diff
Remove broken EntityClassAttribute::inherited flag

Ever since the fix for 0005546 eliminated copying of inherited attributes from
parent entity classes into their children, the 'inherited' bool was rendered
useless, which in turn broke certain functionality such as the colour-coding of
inherited spawnargs in the EClassTree.

The inherited flag is now removed entirely from EntityClassAttribute, and
replaced by an extra bool passed to the AttributeVisitor when visiting entity
class attributes.
Affected Issues
0005546
mod - include/ieclass.h Diff File
mod - libs/eclass.h Diff File
mod - plugins/dm.stimresponse/SRPropertyLoader.cpp Diff File
mod - plugins/dm.stimresponse/SRPropertyLoader.h Diff File
mod - plugins/script/interfaces/EClassInterface.cpp Diff File
mod - radiant/ui/eclasstree/EClassTree.cpp Diff File
mod - radiant/ui/eclasstree/EClassTree.h Diff File
mod - radiant/ui/eclasstree/EClassTreeBuilder.cpp Diff File
mod - radiant/ui/einspector/AddPropertyDialog.cpp Diff File
mod - radiant/ui/einspector/EntityInspector.cpp Diff File
mod - radiantcore/eclass/EntityClass.cpp Diff File
mod - radiantcore/eclass/EntityClass.h Diff File
mod - radiantcore/entity/SpawnArgs.cpp Diff File
mod - test/Entity.cpp Diff File

master 740942bd

01.03.2021 20:34

orbweaver


Details Diff
Rename Doom3EntityClassPtr to EntityClass::Ptr
mod - radiantcore/eclass/EClassManager.cpp Diff File
mod - radiantcore/eclass/EClassManager.h Diff File
mod - radiantcore/eclass/EntityClass.cpp Diff File
mod - radiantcore/eclass/EntityClass.h Diff File

master c01a0324

01.03.2021 20:26

orbweaver


Details Diff
Rename forEachClassAttribute to forEachAttribute
mod - include/ieclass.h Diff File
mod - libs/eclass.h Diff File
mod - plugins/dm.stimresponse/SREntity.cpp Diff File
mod - radiant/ui/eclasstree/EClassTree.cpp Diff File
mod - radiant/ui/einspector/AddPropertyDialog.cpp Diff File
mod - radiant/ui/einspector/EntityInspector.cpp Diff File
mod - radiantcore/eclass/EntityClass.cpp Diff File
mod - radiantcore/eclass/EntityClass.h Diff File
mod - radiantcore/entity/EntityModule.cpp Diff File
mod - radiantcore/entity/SpawnArgs.cpp Diff File

master 49d5846f

01.03.2021 20:16

orbweaver


Details Diff
Rename Doom3EntityClass to EntityClass
mod - radiantcore/CMakeLists.txt Diff File
mod - radiantcore/eclass/EClassManager.cpp Diff File
mod - radiantcore/eclass/EClassManager.h Diff File

materialeditor 6f79172c

28.02.2021 14:59

greebo


Details Diff
0005532: Material Editor supports ignoreDepth stage keyword Affected Issues
0005532
mod - install/ui/materialeditor.fbp Diff File
mod - install/ui/materialeditor.xrc Diff File
mod - radiant/ui/materials/MaterialEditor.cpp Diff File

materialeditor 8bb92cc0

28.02.2021 09:52

greebo


Details Diff
0005532: Material Editor controls for guisurf variants Affected Issues
0005532
mod - install/ui/materialeditor.fbp Diff File
mod - install/ui/materialeditor.xrc Diff File
mod - radiant/ui/materials/MaterialEditor.cpp Diff File

materialeditor 154e7762

28.02.2021 09:25

greebo


Details Diff
0005532: Extend material parser to be able to deal with the guisurf variants Affected Issues
0005532
mod - include/ishaders.h Diff File
mod - radiantcore/shaders/CShader.cpp Diff File
mod - radiantcore/shaders/CShader.h Diff File
mod - radiantcore/shaders/ShaderTemplate.cpp Diff File
mod - radiantcore/shaders/ShaderTemplate.h Diff File
mod - test/Materials.cpp Diff File
mod - test/resources/tdm/materials/parsertest.mtr Diff File

materialeditor cf8035a2

28.02.2021 08:56

greebo


Details Diff
0005532: Material Editor can display fragmentMaps Affected Issues
0005532
mod - install/ui/materialeditor.fbp Diff File
mod - radiant/ui/materials/MaterialEditor.cpp Diff File
mod - radiant/ui/materials/MaterialEditor.h Diff File

materialeditor fca61e1b

28.02.2021 08:47

greebo


Details Diff
0005532: Unit tests covering the fragment map parser Affected Issues
0005532
mod - test/Materials.cpp Diff File
mod - test/resources/tdm/materials/parsertest.mtr Diff File

materialeditor a1fff5e3

28.02.2021 08:36

greebo


Details Diff
0005532: Redesign fragmentMap handling in Doom3ShaderLayer, analogously to the vertexParms. Affected Issues
0005532
mod - include/ShaderLayer.h Diff File
mod - libs/materials/ParseLib.h Diff File
mod - radiantcore/shaders/Doom3ShaderLayer.cpp Diff File
mod - radiantcore/shaders/Doom3ShaderLayer.h Diff File
mod - radiantcore/shaders/ShaderTemplate.cpp Diff File

materialeditor 0b1e67a6

28.02.2021 05:11

greebo


Details Diff
0005532: Material Editor can display vertex parameters in a list Affected Issues
0005532
mod - install/ui/materialeditor.fbp Diff File
mod - install/ui/materialeditor.xrc Diff File
mod - radiant/ui/materials/MaterialEditor.cpp Diff File
mod - radiant/ui/materials/MaterialEditor.h Diff File

materialeditor 87ee8bf8

28.02.2021 04:25

greebo


Details Diff
0005532: Don't ignore VFP layers. Material Editor displays the program name now Affected Issues
0005532
mod - install/ui/materialeditor.fbp Diff File
mod - install/ui/materialeditor.xrc Diff File
mod - radiant/ui/materials/MaterialEditor.cpp Diff File
mod - radiantcore/shaders/ShaderTemplate.cpp Diff File

materialeditor 1041b6f2

28.02.2021 04:17

greebo


Details Diff
0005532: Max number of vertexParms is 4. Affected Issues
0005532
mod - libs/materials/ParseLib.h Diff File
mod - radiantcore/shaders/ShaderTemplate.cpp Diff File
mod - test/Materials.cpp Diff File
mod - test/resources/tdm/materials/parsertest.mtr Diff File

materialeditor c413f294

28.02.2021 04:11

greebo


Details Diff
0005532: Redesign vertexParm handling in Doom3ShaderLayer. Expressions and index are remembered, gaps in the vertex indices are recognisable. Affected Issues
0005532
mod - include/ShaderLayer.h Diff File
mod - radiantcore/shaders/Doom3ShaderLayer.cpp Diff File
mod - radiantcore/shaders/Doom3ShaderLayer.h Diff File
mod - radiantcore/shaders/ShaderTemplate.cpp Diff File
mod - test/Materials.cpp Diff File
mod - test/resources/tdm/materials/parsertest.mtr Diff File
 First  Prev  1 2 3 ... 30 ... 60 ... 90 ... 120 ... 150 ... 152 153 154 155 156 157 158 ... 180 ... 210 ... 240 ... 261 262 263  Next  Last