Changesets: DarkRadiant
|
master 0b00b9fd 07.03.2021 20:30 Details Diff |
Simplify vertex colour handling in interaction shader Modern shaders can work fine with boolean uniforms, so we don't need the awkward "scale and offset" approach to vertex colour handling. Instead we just examine a boolean to determine if the vertex colour should be inverted, and perform the calculation accordingly. |
||
| mod - install/gl/interaction_fp.glsl | Diff File | ||
| mod - radiantcore/rendersystem/backend/glprogram/GLSLBumpProgram.cpp | Diff File | ||
| mod - radiantcore/rendersystem/backend/glprogram/GLSLBumpProgram.h | Diff File | ||
|
materialeditor2 9c3d3139 07.03.2021 13:41 Details Diff |
0002132: The grid should write to the depth buffer, to allow for better visualisation of objects near the XY plane |
Affected Issues 0002132 |
|
| mod - radiant/camera/CamWnd.cpp | Diff File | ||
|
materialeditor2 7579979e 07.03.2021 12:42 Details Diff |
0005532: Start with lighting mode enabled and time running, if we have a material to show in the first place |
Affected Issues 0005532 |
|
| mod - libs/wxutil/preview/RenderPreview.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialPreview.cpp | Diff File | ||
|
master 4d19f816 06.03.2021 14:53 Details Diff |
Remove InternalMaterial mechanism Constructing an entire subclass of Material just to return a single string name is a needlessly complex way of debugging internal shader construction; instead, a simple getName() method on the Shader interface provides the same functionality with much less code. This also means that the Material interface can be kept pure, rather than being filled with stub method implementations just to make the InternalMaterial class shorter. |
||
| mod - include/irender.h | Diff File | ||
| mod - radiantcore/rendersystem/backend/OpenGLShader.cpp | Diff File | ||
| mod - radiantcore/rendersystem/backend/OpenGLShader.h | Diff File | ||
| mod - test/Entity.cpp | Diff File | ||
|
materialeditor2 c5625e6e 06.03.2021 06:18 Details Diff |
Update .gitignore to hide incremental link files | ||
| mod - .gitignore | Diff File | ||
|
materialeditor2 890d89e6 06.03.2021 06:18 Details Diff |
0005532: Got the cube to rotate, it's going to be replaced with a model in the end anyway |
Affected Issues 0005532 |
|
| mod - radiant/ui/materials/MaterialPreview.cpp | Diff File | ||
|
materialeditor2 0ab29770 06.03.2021 06:17 Details Diff |
0005532: Extend brush interface by IBrush::clear() to remove all faces |
Affected Issues 0005532 |
|
| mod - include/ibrush.h | Diff File | ||
| mod - radiantcore/brush/Brush.h | Diff File | ||
|
materialeditor2 173d8570 06.03.2021 06:16 Details Diff |
Set VC++ option /ZI the enable Edit and Continue | ||
| mod - tools/msvc/properties/DarkRadiant Base Debug Win32.props | Diff File | ||
| mod - tools/msvc/properties/DarkRadiant Base Debug x64.props | Diff File | ||
|
materialeditor2 f6eddb66 06.03.2021 05:32 Details Diff |
0005532: Rotating cube, with ugly code |
Affected Issues 0005532 |
|
| mod - libs/wxutil/preview/RenderPreview.cpp | Diff File | ||
| mod - libs/wxutil/preview/RenderPreview.h | Diff File | ||
| mod - radiant/ui/materials/MaterialPreview.cpp | Diff File | ||
|
materialeditor2 69a5bb53 06.03.2021 04:53 Details Diff |
0005532: Working on the preview scene |
Affected Issues 0005532 |
|
| mod - radiant/ui/materials/MaterialPreview.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialPreview.h | Diff File | ||
|
materialeditor2 6ddf6b4c 06.03.2021 04:53 Details Diff |
0005532: Fix crash in lighting mode due to (yet unsupported) VFP stages |
Affected Issues 0005532 |
|
| mod - radiantcore/rendersystem/backend/OpenGLShader.cpp | Diff File | ||
|
materialeditor2 f238d0b7 05.03.2021 17:31 Details Diff |
0005532: Hide the grid and the toolbar button in the MaterialPreview |
Affected Issues 0005532 |
|
| mod - libs/wxutil/preview/RenderPreview.cpp | Diff File | ||
| mod - libs/wxutil/preview/RenderPreview.h | Diff File | ||
| mod - radiant/ui/materials/MaterialPreview.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialPreview.h | Diff File | ||
|
materialeditor2 244ad4ef 05.03.2021 17:19 Details Diff |
0005532: Setup empty MaterialPreview class |
Affected Issues 0005532 |
|
| mod - radiant/CMakeLists.txt | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.h | Diff File | ||
| add - radiant/ui/materials/MaterialPreview.cpp | Diff File | ||
| add - radiant/ui/materials/MaterialPreview.h | Diff File | ||
| mod - tools/msvc/DarkRadiant.vcxproj | Diff File | ||
| mod - tools/msvc/DarkRadiant.vcxproj.filters | Diff File | ||
|
master 1c352965 05.03.2021 06:24 Details Diff |
0005532: Compilation fixes |
Affected Issues 0005532 |
|
| mod - radiant/ui/common/MaterialPopulator.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialEditorModule.cpp | Diff File | ||
| mod - radiantcore/shaders/MapExpression.h | Diff File | ||
|
master 7c118084 05.03.2021 05:31 Details Diff |
Fix stage unit test now that the parser is recognising the VFP stage with fragment maps | ||
| mod - test/Materials.cpp | Diff File | ||
|
master 727ac4f2 05.03.2021 05:25 Details Diff |
Compilation fixes, getMaterialForName => getMaterial | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| mod - test/Materials.cpp | Diff File | ||
|
master f7311ea6 05.03.2021 05:21 Details Diff |
Merge branch 'materialeditor', to base the upcoming changes on the latest main branch # Conflicts: # include/ShaderLayer.h # include/ishaders.h # radiant/ui/mediabrowser/MediaBrowserTreeView.cpp # radiantcore/shaders/CShader.h # test/Materials.cpp # tools/msvc/DarkRadiant.vcxproj.filters # tools/msvc/DarkRadiantCore.vcxproj.filters |
||
| mod - include/ShaderLayer.h | Diff File | ||
| mod - include/ishaderexpression.h | Diff File | ||
| mod - include/ishaders.h | Diff File | ||
| mod - include/precompiled_interfaces.h | Diff File | ||
| add - install/bitmaps/soundmap.png | Diff File | ||
| add - install/bitmaps/soundmap_wave.png | Diff File | ||
| add - install/bitmaps/videomap.png | Diff File | ||
| add - install/ui/materialeditor.fbp | Diff File | ||
| add - install/ui/materialeditor.xrc | Diff File | ||
| add - libs/materials/ParseLib.h | Diff File | ||
| mod - libs/wxutil/SourceView.cpp | Diff File | ||
| mod - libs/wxutil/dataview/ResourceTreeView.cpp | Diff File | ||
| mod - radiant/CMakeLists.txt | Diff File | ||
| add - radiant/ui/common/MaterialPopulator.cpp | Diff File | ||
| add - radiant/ui/common/MaterialPopulator.h | Diff File | ||
| add - radiant/ui/common/MaterialTreeView.cpp | Diff File | ||
| add - radiant/ui/common/MaterialTreeView.h | Diff File | ||
| add - radiant/ui/materials/Binding.h | Diff File | ||
| add - radiant/ui/materials/ExpressionBinding.h | Diff File | ||
| add - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| add - radiant/ui/materials/MaterialEditor.h | Diff File | ||
| add - radiant/ui/materials/MaterialEditorModule.cpp | Diff File | ||
| mod - radiant/ui/mediabrowser/MediaBrowserTreeView.cpp | Diff File | ||
| mod - radiant/ui/mediabrowser/MediaBrowserTreeView.h | Diff File | ||
| mod - radiantcore/imagefile/ImageLoader.cpp | Diff File | ||
| mod - radiantcore/shaders/CShader.cpp | Diff File | ||
| mod - radiantcore/shaders/CShader.h | Diff File | ||
| mod - radiantcore/shaders/CameraCubeMapDecl.cpp | Diff File | ||
| mod - radiantcore/shaders/CameraCubeMapDecl.h | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
| mod - radiantcore/shaders/MapExpression.cpp | Diff File | ||
| mod - radiantcore/shaders/MapExpression.h | Diff File | ||
| mod - radiantcore/shaders/ShaderExpression.cpp | Diff File | ||
| mod - radiantcore/shaders/ShaderExpression.h | Diff File | ||
| mod - radiantcore/shaders/ShaderTemplate.cpp | Diff File | ||
| mod - radiantcore/shaders/ShaderTemplate.h | Diff File | ||
| add - radiantcore/shaders/SoundMapExpression.h | Diff File | ||
| add - radiantcore/shaders/VideoMapExpression.h | Diff File | ||
| mod - test/Materials.cpp | Diff File | ||
| add - test/resources/tdm/materials/parsertest.mtr | Diff File | ||
| 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/libs.vcxproj | Diff File | ||
| mod - tools/msvc/libs.vcxproj.filters | Diff File | ||
|
master 70a0e7fd 05.03.2021 04:39 Details Diff |
Adjust post build event to load the AUI binaries to the install location. | ||
| mod - tools/msvc/post_build_event.cmd | Diff File | ||
| mod - tools/msvc/post_build_event_x64.cmd | Diff File | ||
|
master afca9c48 05.03.2021 04:34 Details Diff |
Introduce a MaterialManager::createDefaultMaterial method to create the internal materials for use in shaders like the entity colour shaders. This partially reverts the commit e52ceae, mainly to keep the Material interface abstract, and also to separate the material-related business from the OpenGLShader code. |
||
| mod - include/ishaders.h | 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/ShaderLibrary.cpp | Diff File | ||
| mod - radiantcore/shaders/ShaderLibrary.h | Diff File | ||
| mod - test/Materials.cpp | Diff File | ||
|
master 78ed0907 05.03.2021 04:12 Details Diff |
Remove nonexistent file from include.vcxproj | ||
| mod - tools/msvc/include.vcxproj | Diff File | ||
|
master c9e63498 05.03.2021 03:54 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 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 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 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 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 | ||