Changesets: DarkRadiant
|
materialeditor2 921a5571 14.03.2021 13:09 Details Diff |
0005532: Ensure that re-using register indices is safe (they are not shared) when linking expressions |
Affected Issues 0005532 |
|
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
|
master 3403de15 14.03.2021 12:51 Details Diff |
Use non-cubic light dimensions for omni light test Confirm that all three scale elements of the light texture matrix are set according to their respective dimensions, rather than using a cube light with identical scale factors on each axis. |
||
| mod - test/Renderer.cpp | Diff File | ||
|
materialeditor2 9d340bb1 14.03.2021 12:26 Details Diff |
0005532: Migrate colour expressions |
Affected Issues 0005532 |
|
| mod - include/ishaderlayer.h | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
|
materialeditor2 01be8edf 14.03.2021 11:11 Details Diff |
0005532: Migrate condition to use expression slots |
Affected Issues 0005532 |
|
| mod - include/ishaderlayer.h | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
|
materialeditor2 32c566c5 14.03.2021 10:59 Details Diff |
0005532: Migrate texgen expressions to use slots |
Affected Issues 0005532 |
|
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
|
materialeditor2 3e136b9a 14.03.2021 09:04 Details Diff |
0005532: Migrating texgen param expressions to use the expression slots |
Affected Issues 0005532 |
|
| mod - include/ishaderlayer.h | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
|
materialeditor2 9b4e70dc 14.03.2021 06:17 Details Diff |
0005532: Start refactoring expression handling in the shader layer. Instead of keeping track of multiple indices, introduce an ExpressionSlot structure which will hold the necessary information. Alphatest has already been migrated. |
Affected Issues 0005532 |
|
| mod - include/ishaderexpression.h | Diff File | ||
| mod - include/ishaderlayer.h | Diff File | ||
| mod - include/ishaders.h | Diff File | ||
| mod - radiant/ui/materials/ExpressionBinding.h | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.h | Diff File | ||
| mod - radiantcore/shaders/CShader.cpp | Diff File | ||
| mod - radiantcore/shaders/CShader.h | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderSystem.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderSystem.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 | ||
|
materialeditor2 9179605c 14.03.2021 05:16 Details Diff |
0005532: Alphatest entry box supports expressions now |
Affected Issues 0005532 |
|
| mod - include/ishaderlayer.h | Diff File | ||
| 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 | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
|
materialeditor2 f553f760 13.03.2021 15:04 Details Diff |
0005532: As PoC, changing the stage map expression is working |
Affected Issues 0005532 |
|
| mod - radiant/ui/materials/Binding.h | Diff File | ||
| mod - radiant/ui/materials/ExpressionBinding.h | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
|
materialeditor2 bf963b99 13.03.2021 14:01 Details Diff |
0005532: Notify the preview about the material change, which will in turn notify its render system - changes of translation expressions can now immediately be seen |
Affected Issues 0005532 |
|
| mod - include/irender.h | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.h | Diff File | ||
| mod - radiant/ui/materials/MaterialPreview.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialPreview.h | Diff File | ||
| mod - radiantcore/rendersystem/OpenGLRenderSystem.cpp | Diff File | ||
| mod - radiantcore/rendersystem/OpenGLRenderSystem.h | Diff File | ||
|
materialeditor2 3a90cce5 13.03.2021 13:49 Details Diff |
0005532: Re-assigning expressions is working within the Doom3ShaderLayer now. The render passes don't refresh themselves yet. |
Affected Issues 0005532 |
|
| mod - include/ishaderexpression.h | Diff File | ||
| mod - radiantcore/shaders/CShader.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
| mod - radiantcore/shaders/ShaderExpression.h | Diff File | ||
|
materialeditor2 f21f7689 13.03.2021 06:32 Details Diff |
0005532: WIP commit, trying to get the shader layer updates working |
Affected Issues 0005532 |
|
| mod - include/ishaderlayer.h | Diff File | ||
| mod - include/ishaders.h | Diff File | ||
| mod - radiant/ui/materials/Binding.h | Diff File | ||
| mod - radiant/ui/materials/ExpressionBinding.h | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.h | Diff File | ||
| mod - radiantcore/shaders/CShader.cpp | Diff File | ||
| mod - radiantcore/shaders/CShader.h | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
|
materialeditor2 d24d64f2 13.03.2021 05:08 Details Diff |
0005532: Introduce an extended IEditableShaderLayer interface. Just returning a const IShaderLayer reference for non-edit scenarios turns out to be impractical, since the render passes need to evaluate time-dependent expressions and update the stage's registers, requiring non-const access to the stages. The Material itself needs to know when it's being modified, so I went for intruducing a separate Material::getEditableLayer() method that is taking care of the backup clone as soon as it's called. This way it's possible to inspect and render a material without implicitly marking it as modified. |
Affected Issues 0005532 |
|
| mod - include/ishaderlayer.h | Diff File | ||
| mod - include/ishaders.h | Diff File | ||
| mod - radiantcore/shaders/CShader.cpp | Diff File | ||
| mod - radiantcore/shaders/CShader.h | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
|
materialeditor2 c9d942b5 13.03.2021 04:26 Details Diff |
0005532: Rename ShaderLayer interface to IShaderLayer |
Affected Issues 0005532 |
|
| mod - include/iglrender.h | Diff File | ||
| mod - include/irender.h | Diff File | ||
| mod - include/ishaderlayer.h | Diff File | ||
| mod - include/ishaders.h | Diff File | ||
| mod - libs/materials/ParseLib.h | Diff File | ||
| mod - libs/wxutil/preview/GuiRenderer.cpp | Diff File | ||
| mod - radiant/ui/common/ShaderSelector.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.h | Diff File | ||
| mod - radiantcore/model/export/WavefrontExporter.cpp | Diff File | ||
| mod - radiantcore/rendersystem/backend/OpenGLShader.cpp | Diff File | ||
| mod - radiantcore/rendersystem/backend/OpenGLShader.h | Diff File | ||
| mod - radiantcore/rendersystem/backend/OpenGLShaderPass.cpp | Diff File | ||
| mod - radiantcore/rendersystem/backend/OpenGLShaderPass.h | Diff File | ||
| mod - radiantcore/shaders/CShader.cpp | Diff File | ||
| mod - radiantcore/shaders/CShader.h | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.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/ShaderTemplate.cpp | Diff File | ||
| mod - radiantcore/shaders/ShaderTemplate.h | Diff File | ||
| mod - test/Materials.cpp | Diff File | ||
|
materialeditor2 dd315a27 13.03.2021 04:19 Details Diff |
0005532: Rename ShaderLayer.h to ishaderlayer.h |
Affected Issues 0005532 |
|
| mod - include/iglrender.h | Diff File | ||
| mod - include/irender.h | Diff File | ||
| mod - include/ishaders.h | Diff File | ||
| mod - include/precompiled_interfaces.h | Diff File | ||
| mod - libs/materials/ParseLib.h | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.h | Diff File | ||
| mod - radiantcore/rendersystem/backend/OpenGLShader.cpp | Diff File | ||
| mod - radiantcore/rendersystem/backend/OpenGLShader.h | Diff File | ||
| mod - radiantcore/rendersystem/backend/OpenGLShaderPass.cpp | Diff File | ||
| mod - radiantcore/rendersystem/backend/OpenGLShaderPass.h | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
| mod - radiantcore/shaders/ShaderTemplate.cpp | Diff File | ||
| mod - radiantcore/shaders/ShaderTemplate.h | Diff File | ||
| mod - tools/msvc/include.vcxproj | Diff File | ||
|
materialeditor2 59f6e2fe 13.03.2021 04:08 Details Diff |
0005532: Add some const qualifiers for consistency |
Affected Issues 0005532 |
|
| mod - include/ShaderLayer.h | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
|
materialeditor2 bd351c7a 13.03.2021 03:43 Details Diff |
0005532: Refactor bindings to support a preparation step before modifying a shader stage |
Affected Issues 0005532 |
|
| mod - include/ShaderLayer.h | Diff File | ||
| mod - radiant/ui/materials/Binding.h | Diff File | ||
| mod - radiant/ui/materials/ExpressionBinding.h | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.h | Diff File | ||
| mod - radiant/ui/materials/MaterialPreview.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
|
materialeditor2 8521dbe2 12.03.2021 16:49 Details Diff |
0005532: Set material type on choice |
Affected Issues 0005532 |
|
| mod - include/ishaders.h | Diff File | ||
| mod - libs/materials/ParseLib.h | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.h | Diff File | ||
| mod - radiantcore/shaders/CShader.cpp | Diff File | ||
| mod - radiantcore/shaders/CShader.h | Diff File | ||
| mod - radiantcore/shaders/ShaderTemplate.h | Diff File | ||
|
materialeditor2 975ec22f 12.03.2021 16:39 Details Diff |
0005532: Description is editable |
Affected Issues 0005532 |
|
| mod - include/ishaders.h | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
| mod - radiantcore/shaders/CShader.cpp | Diff File | ||
| mod - radiantcore/shaders/CShader.h | Diff File | ||
| mod - radiantcore/shaders/ShaderTemplate.h | Diff File | ||
|
materialeditor2 e576be01 12.03.2021 15:38 Details Diff |
0005532: Wire up the material flags |
Affected Issues 0005532 |
|
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
|
materialeditor2 779ed5c0 12.03.2021 15:31 Details Diff |
0005532: Setup methods to set/clear material flags |
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.h | Diff File | ||
|
materialeditor2 f1cdf057 12.03.2021 14:33 Details Diff |
0005532: Implement copy/clone functionality for ShaderTemplate and Doom3ShaderLayer |
Affected Issues 0005532 |
|
| mod - radiantcore/shaders/Doom3ShaderLayer.cpp | Diff File | ||
| mod - radiantcore/shaders/Doom3ShaderLayer.h | Diff File | ||
| mod - radiantcore/shaders/ShaderTemplate.cpp | Diff File | ||
|
materialeditor2 8c4d89ed 12.03.2021 14:12 Details Diff |
0005532: Some refactoring. Add a skeleton ShaderTemplate::clone() method, which will be used to create a backup of the template before the material is modifying any of its properties. |
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 | ||
|
materialeditor2 6a4e9d9d 12.03.2021 12:53 Details Diff |
0005532: CheckBoxBinding supports an optional save function |
Affected Issues 0005532 |
|
| mod - radiant/ui/materials/Binding.h | Diff File | ||
| mod - radiant/ui/materials/MaterialEditor.cpp | Diff File | ||
|
materialeditor2 fe7a6961 12.03.2021 10:56 Details Diff |
0005532: Choose between cube and sphere, just to prove the model switch is working |
Affected Issues 0005532 |
|
| add - install/bitmaps/cube.png | Diff File | ||
| add - install/bitmaps/sphere.png | Diff File | ||
| mod - install/resources/preview/cube.ase | Diff File | ||
| 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/MaterialPreview.cpp | Diff File | ||
| mod - radiant/ui/materials/MaterialPreview.h | Diff File | ||