Changesets: DarkRadiant
master b5d9c488 24.06.2021 10:12 Details Diff |
0005643: Partial implementation for handling modified source layers |
Affected Issues 0005643 |
|
mod - libs/scene/merge/ThreeWayLayerMerger.h | Diff File | ||
master eeff905b 24.06.2021 09:36 Details Diff |
0005643: Implemented layer addition handling, unit test case is green |
Affected Issues 0005643 |
|
mod - libs/scene/merge/ThreeWayLayerMerger.h | Diff File | ||
mod - test/MapMerging.cpp | Diff File | ||
master fbe6af79 24.06.2021 08:41 Details Diff |
0005643: Partially implement the handling for layer additions to the source map |
Affected Issues 0005643 |
|
mod - libs/scene/merge/ThreeWayLayerMerger.h | Diff File | ||
mod - test/MapMerging.cpp | Diff File | ||
master 7b4be456 24.06.2021 04:00 Details Diff |
0005643: Implement handling of deleted layers |
Affected Issues 0005643 |
|
mod - libs/scene/merge/LayerMerger.h | Diff File | ||
mod - libs/scene/merge/ThreeWayLayerMerger.h | Diff File | ||
master 752eb305 24.06.2021 03:38 Details Diff |
0005643: WIP commit, working on the layer merge implementation |
Affected Issues 0005643 |
|
mod - libs/scene/merge/LayerMerger.h | Diff File | ||
add - libs/scene/merge/LayerMergerBase.h | Diff File | ||
mod - libs/scene/merge/ThreeWayLayerMerger.h | Diff File | ||
mod - tools/msvc/scenelib.vcxproj | Diff File | ||
mod - tools/msvc/scenelib.vcxproj.filters | Diff File | ||
master 5e43e7b8 23.06.2021 19:46 Details Diff |
Initial test for mipmap dimensions Re-introduce an optional "level" parameter into Image::getWidth() and getHeight(), allowing the size of a specified mipmap level to be queried. This is not used in any live code but is used by tests to confirm that mipmaps have the expected dimensions. |
||
mod - include/iimage.h | Diff File | ||
mod - libs/RGBAImage.h | Diff File | ||
mod - radiantcore/imagefile/dds.cpp | Diff File | ||
mod - test/ImageLoading.cpp | Diff File | ||
master 02cc4035 23.06.2021 19:31 Details Diff |
Workaround for failure to render NPOT DDS mipmaps Check the GL errors, and if there is an error after uploading a mipmap for detail level > 0, fall back to calling glGenerateMipmap() after warning on the console. This resolves the failure to render the NPOT texture, but it does not fix the underlying issue with correctly uploading the file's mipmaps. |
||
mod - radiantcore/imagefile/dds.cpp | Diff File | ||
master 57e5a59c 23.06.2021 19:18 Details Diff |
Improve GL error handling in DDSImage - Move debug::assertNoGlErrors() into a similar function debug::checkGLErrors(), which does not require debug builds and also returns the last error detected. The legacy assertNoGlErrors() is a wrapper for this new function with the additional NDEBUG check. - DDSImage calls checkGLErrors() after each mipmap upload, reporting any failure to the console. This confirms that there is a GL_INVALID_VALUE error when attempting to upload the NPOT mipmaps. |
||
mod - libs/debugging/gl.h | Diff File | ||
mod - radiantcore/imagefile/dds.cpp | Diff File | ||
master 3e316e25 23.06.2021 15:14 Details Diff |
0005643: Crafting the layer merge unit test cases |
Affected Issues 0005643 |
|
mod - test/MapMerging.cpp | Diff File | ||
add - test/resources/tdm/maps/threeway_merge_layers_source_1.mapx | Diff File | ||
add - test/resources/tdm/maps/threeway_merge_layers_target_1.mapx | Diff File | ||
master b564f2fc 22.06.2021 19:39 Details Diff |
Streamline DDSImage::addMipMap() For some reason this method was called with individual parameters corresponding to the members of MipMapInfo, which were initialised from an existing MipMapInfo object, only to be reconstructed into a new MipMapInfo object in the method body. We now just pass the existing MipMapInfo by const reference. |
||
mod - radiantcore/imagefile/dds.cpp | Diff File | ||
master 011517a2 22.06.2021 19:22 Details Diff |
Add test for loading DXT5 NPOT with mipmaps The metadata appears correct so this test passes, however this image renders blank in the camera view. This suggests that the problem is with the OpenGL configuration. |
||
mod - test/ImageLoading.cpp | Diff File | ||
add - test/resources/tdm/textures/dds/test_60x128_dxt5_mips.dds | Diff File | ||
master 426c7da7 22.06.2021 19:14 Details Diff |
Add test for DXT5 NPOT loading Load a 60x128 image (without mipmaps) and confirm expected dimensions and compression flag. This image renders correctly in the camera view. |
||
mod - test/ImageLoading.cpp | Diff File | ||
add - test/resources/tdm/textures/dds/test_60x128_dxt5.dds | Diff File | ||
master a21511de 22.06.2021 19:03 Details Diff |
0005643: ThreeWayLayerMerger class stub (copied from LayerMerger) |
Affected Issues 0005643 |
|
add - libs/scene/merge/ThreeWayLayerMerger.h | Diff File | ||
mod - libs/scene/merge/ThreeWayMergeOperation.cpp | Diff File | ||
mod - libs/scene/merge/ThreeWayMergeOperation.h | Diff File | ||
mod - tools/msvc/scenelib.vcxproj | Diff File | ||
mod - tools/msvc/scenelib.vcxproj.filters | Diff File | ||
master 23b21e0f 22.06.2021 18:58 Details Diff |
Upload uncompressed DDS in BGR rather than RGB order It is unclear why DDS data is appearing in BGR order, since nothing in the header or the specification suggests that data should be stored in this format. However the game code also does the same swizzling, so this seems to be the expected way to handle uncompressed DDS. This probably will not affect most users since the use of uncompressed DDS is rare. |
||
mod - radiantcore/imagefile/dds.cpp | Diff File | ||
master f33fefac 22.06.2021 18:17 Details Diff |
0005643: Change unit test assertion now that redundant selection groups are purged during processing |
Affected Issues 0005643 |
|
mod - test/MapMerging.cpp | Diff File | ||
master 6d18eb9e 22.06.2021 17:56 Details Diff |
0005643: Cleanup and docs |
Affected Issues 0005643 |
|
mod - libs/scene/merge/ThreeWaySelectionGroupMerger.h | Diff File | ||
master aca1f96b 22.06.2021 12:45 Details Diff |
0005643: Fixup unit test code, had to remove a few assertions since they are not useful to detect whether things are working |
Affected Issues 0005643 |
|
mod - test/MapMerging.cpp | Diff File | ||
master 79abab4a 22.06.2021 12:22 Details Diff |
0005643: Make sure no groups of the same size are stacked on top of each other for each node. Merge these groups of same size if they turn out this way after merging. |
Affected Issues 0005643 |
|
mod - libs/scene/merge/SelectionGroupMergerBase.h | Diff File | ||
mod - libs/scene/merge/ThreeWaySelectionGroupMerger.h | Diff File | ||
master fc68f1b3 22.06.2021 09:20 Details Diff |
0005643: Add Change tracking to ThreeWaySelectionGroupMerger |
Affected Issues 0005643 |
|
mod - libs/scene/merge/SelectionGroupMerger.h | Diff File | ||
mod - libs/scene/merge/SelectionGroupMergerBase.h | Diff File | ||
mod - libs/scene/merge/ThreeWaySelectionGroupMerger.h | Diff File | ||
mod - test/MapMerging.cpp | Diff File | ||
mod - test/resources/tdm/maps/threeway_merge_groups_source_1.mapx | Diff File | ||
mod - test/resources/tdm/maps/threeway_merge_groups_target_1.mapx | Diff File | ||
master 3a346c28 22.06.2021 05:13 Details Diff |
0005643: Start crafting the three way selection group merge unit test cases. First rough implementation of the ThreeWaySelectionGroupMerger class. |
Affected Issues 0005643 |
|
mod - libs/scene/merge/SelectionGroupMergerBase.h | Diff File | ||
mod - libs/scene/merge/ThreeWaySelectionGroupMerger.h | Diff File | ||
mod - test/MapMerging.cpp | Diff File | ||
add - test/resources/tdm/maps/threeway_merge_groups_base.mapx | Diff File | ||
add - test/resources/tdm/maps/threeway_merge_groups_source_1.mapx | Diff File | ||
add - test/resources/tdm/maps/threeway_merge_groups_target_1.mapx | Diff File | ||
master 9c0c68de 21.06.2021 10:59 Details Diff |
0005643: Move finger print helpers to base class |
Affected Issues 0005643 |
|
mod - libs/scene/merge/SelectionGroupMerger.h | Diff File | ||
mod - libs/scene/merge/SelectionGroupMergerBase.h | Diff File | ||
mod - libs/scene/merge/ThreeWaySelectionGroupMerger.h | Diff File | ||
master dee964f4 21.06.2021 10:48 Details Diff |
0005643: Start implementing the 3-way selection group merge algorithm |
Affected Issues 0005643 |
|
mod - libs/scene/merge/SelectionGroupMerger.h | Diff File | ||
add - libs/scene/merge/SelectionGroupMergerBase.h | Diff File | ||
mod - libs/scene/merge/ThreeWayMergeOperation.cpp | Diff File | ||
mod - libs/scene/merge/ThreeWayMergeOperation.h | Diff File | ||
add - libs/scene/merge/ThreeWaySelectionGroupMerger.h | Diff File | ||
mod - tools/msvc/scenelib.vcxproj | Diff File | ||
mod - tools/msvc/scenelib.vcxproj.filters | Diff File | ||
master 58dde92a 21.06.2021 08:45 Details Diff |
0005643: Add "FocusView" command accepting two vector3 arguments (origin and angles). Implement Jump to next Conflict functionality. |
Affected Issues 0005643 |
|
mod - install/ui/mergecontroldialog.fbp | Diff File | ||
mod - install/ui/mergecontroldialog.xrc | Diff File | ||
mod - libs/scenelib.h | Diff File | ||
mod - radiant/ui/entitylist/EntityList.cpp | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.h | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
mod - radiantcore/map/Map.h | Diff File | ||
mod - radiantcore/map/MapPosition.cpp | Diff File | ||
mod - radiantcore/map/MapPositionManager.cpp | Diff File | ||
master f159b4cd 21.06.2021 04:57 Details Diff |
0005643: Notify when there's nothing to merge. Display a description of every single merge action. |
Affected Issues 0005643 |
|
mod - include/imapmerge.h | Diff File | ||
mod - install/ui/mergecontroldialog.fbp | Diff File | ||
mod - install/ui/mergecontroldialog.xrc | Diff File | ||
mod - libs/scene/merge/MergeOperationBase.cpp | Diff File | ||
mod - libs/scene/merge/MergeOperationBase.h | Diff File | ||
mod - radiant/ui/einspector/EntityInspector.cpp | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
mod - radiantcore/map/Map.cpp | Diff File | ||
master 6f5a0c5d 20.06.2021 17:35 Details Diff |
0005643: Some simplifications |
Affected Issues 0005643 |
|
mod - install/ui/mergecontroldialog.fbp | Diff File | ||
mod - install/ui/mergecontroldialog.xrc | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.cpp | Diff File | ||
mod - radiant/ui/merge/MergeControlDialog.h | Diff File |