Changesets: DarkRadiant

map_merge 9827b566

24.05.2021 06:07

greebo


Details Diff
0005623: Move ComparisonResult to its own file Affected Issues
0005623
add - libs/scene/merge/ComparisonResult.h Diff File
mod - libs/scene/merge/GraphComparer.h Diff File
mod - radiantcore/map/algorithm/Import.h Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File

map_merge 63444dc6

24.05.2021 06:05

greebo


Details Diff
0005623: Move classes to scene::merge namespace Affected Issues
0005623
mod - libs/scene/CMakeLists.txt Diff File
mod - radiantcore/map/algorithm/Import.cpp Diff File
mod - radiantcore/map/algorithm/Import.h Diff File
mod - test/MapMerging.cpp Diff File
mod - test/resources/tdm/maps/fingerprinting.mapx Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File

map_merge 684abd21

24.05.2021 05:54

greebo


Details Diff
0005623: Start creating a few object types to define a merge operation Affected Issues
0005623
add - libs/scene/merge/MergeAction.h Diff File
add - libs/scene/merge/MergeOperation.h Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File

map_merge c862c0a1

24.05.2021 05:54

greebo


Details Diff
0005622: Add some layer changes to the two map variants Affected Issues
0005622
mod - test/resources/tdm/maps/fingerprinting.mapx Diff File
mod - test/resources/tdm/maps/fingerprinting_2.mapx Diff File

map_merge a18d3a02

24.05.2021 05:03

greebo


Details Diff
0005622: Child primitive unit tests Affected Issues
0005622
mod - test/MapMerging.cpp Diff File

map_merge 383a01a9

24.05.2021 04:38

greebo


Details Diff
0005622: Child primitive diff algorithm Affected Issues
0005622
mod - libs/scene/SceneGraphComparer.cpp Diff File
mod - libs/scene/SceneGraphComparer.h Diff File
mod - test/MapMerging.cpp Diff File
mod - test/resources/tdm/maps/fingerprinting.mapx Diff File
mod - test/resources/tdm/maps/fingerprinting_2.mapx Diff File

map_merge dd8a7e66

24.05.2021 03:50

greebo


Details Diff
0005622: Linux paths are case-sensitive, who would've thought Affected Issues
0005622
mod - libs/math/SHA256.cpp Diff File

map_merge a2ae6c0c

24.05.2021 03:45

greebo


Details Diff
0005622: Adjust CMakeLists.txt Affected Issues
0005622
mod - libs/math/CMakeLists.txt Diff File

map_merge 4855bccc

23.05.2021 18:55

greebo


Details Diff
0005622: Remove some debug output Affected Issues
0005622
mod - libs/scene/SceneGraphComparer.cpp Diff File

map_merge 88b753cf

23.05.2021 18:42

greebo


Details Diff
0005622: CMakeLists adjusted Affected Issues
0005622
mod - radiantcore/CMakeLists.txt Diff File

map_merge b0db81ea

23.05.2021 18:41

greebo


Details Diff
0005622: Couple of unit tests Affected Issues
0005622
mod - libs/scene/SceneGraphComparer.h Diff File
mod - test/MapMerging.cpp Diff File
mod - test/resources/tdm/maps/fingerprinting.mapx Diff File
add - test/resources/tdm/maps/fingerprinting_2.mapx Diff File

map_merge 17a3345c

23.05.2021 18:14

greebo


Details Diff
0005622: Rename target to base Affected Issues
0005622
mod - libs/scene/SceneGraphComparer.cpp Diff File
mod - libs/scene/SceneGraphComparer.h Diff File

map_merge 8157b090

23.05.2021 17:56

greebo


Details Diff
0005622: Move comparer class to scenelib Affected Issues
0005622
mod - libs/scene/CMakeLists.txt Diff File
mod - radiantcore/map/algorithm/Import.cpp Diff File
mod - radiantcore/map/algorithm/Import.h Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj.filters Diff File
mod - tools/msvc/scenelib.vcxproj Diff File
mod - tools/msvc/scenelib.vcxproj.filters Diff File

map_merge 314c8914

23.05.2021 17:50

greebo


Details Diff
0005622: Entity key/value comparison Affected Issues
0005622
mod - radiantcore/map/algorithm/SceneGraphComparer.cpp Diff File
mod - radiantcore/map/algorithm/SceneGraphComparer.h Diff File

map_merge dd06f738

23.05.2021 16:16

greebo


Details Diff
0005622: Missing entities are now recorded in the result, detailed diff of name-matching entities should follow Affected Issues
0005622
mod - radiantcore/map/algorithm/Import.cpp Diff File
mod - radiantcore/map/algorithm/SceneGraphComparer.cpp Diff File
mod - radiantcore/map/algorithm/SceneGraphComparer.h Diff File

map_merge cbbd03d5

23.05.2021 15:15

greebo


Details Diff
0005622: Entity matching Affected Issues
0005622
mod - radiantcore/map/algorithm/SceneGraphComparer.cpp Diff File
mod - radiantcore/map/algorithm/SceneGraphComparer.h Diff File

map_merge d0a6f6d8

23.05.2021 14:32

greebo


Details Diff
0005622: Move algorithm to separate file Affected Issues
0005622
mod - radiantcore/CMakeLists.txt Diff File
mod - radiantcore/map/algorithm/Import.cpp Diff File
mod - radiantcore/map/algorithm/Import.h Diff File
add - radiantcore/map/algorithm/SceneGraphComparer.cpp Diff File
add - radiantcore/map/algorithm/SceneGraphComparer.h Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj Diff File
mod - tools/msvc/DarkRadiantCore.vcxproj.filters Diff File

map_merge 8fcc1962

23.05.2021 13:52

greebo


Details Diff
0005622: No double-registering matching entities Affected Issues
0005622
mod - radiantcore/map/algorithm/Import.cpp Diff File

map_merge 51512a65

23.05.2021 13:47

greebo


Details Diff
0005622: Produce an SHA256 hash as fingerprint.
SHA256 implementation was taken from TDM's source code, which was in turn taken from B-Con's repository on Github.
Affected Issues
0005622
mod - LICENSE Diff File
mod - include/icomparablenode.h Diff File
mod - libs/math/Hash.h Diff File
add - libs/math/SHA256.cpp Diff File
add - libs/math/SHA256.h Diff File
mod - radiantcore/brush/BrushNode.cpp Diff File
mod - radiantcore/brush/BrushNode.h Diff File
mod - radiantcore/entity/EntityNode.cpp Diff File
mod - radiantcore/entity/EntityNode.h Diff File
mod - radiantcore/map/algorithm/Import.cpp Diff File
mod - radiantcore/map/algorithm/Import.h Diff File
mod - radiantcore/patch/PatchNode.cpp Diff File
mod - radiantcore/patch/PatchNode.h Diff File
mod - test/MapMerging.cpp Diff File
mod - tools/msvc/mathlib.vcxproj Diff File

map_merge 4fd43a9d

23.05.2021 10:36

greebo


Details Diff
0005622: Refactor result type Affected Issues
0005622
mod - radiantcore/map/algorithm/Import.cpp Diff File
mod - radiantcore/map/algorithm/Import.h Diff File

map_merge ee030261

23.05.2021 09:11

greebo


Details Diff
0005622: Compare entities first Affected Issues
0005622
mod - radiantcore/map/Map.cpp Diff File
mod - radiantcore/map/algorithm/Import.cpp Diff File
mod - radiantcore/map/algorithm/Import.h Diff File

map_merge 8db49603

23.05.2021 07:40

greebo


Details Diff
0005622: Entity fingerprint is insensitive to the order of its child nodes Affected Issues
0005622
mod - radiantcore/entity/EntityNode.cpp Diff File

map_merge f1a74e7e

23.05.2021 07:37

greebo


Details Diff
0005622: Extend entity fingerprint unit tests covering the order of child nodes Affected Issues
0005622
mod - test/MapMerging.cpp Diff File

map_merge 39629130

23.05.2021 07:25

greebo


Details Diff
0005622: Entity nodes are including child fingerprints. Changes in hierarchies will be considered in a second comparison pass. Affected Issues
0005622
mod - radiantcore/entity/EntityNode.cpp Diff File
mod - test/MapMerging.cpp Diff File

map_merge 160cae89

23.05.2021 07:07

greebo


Details Diff
0005622: Comparison algorithm WIP Affected Issues
0005622
mod - radiantcore/map/algorithm/Import.cpp Diff File
mod - radiantcore/map/algorithm/Import.h Diff File
 First  Prev  1 2 3 ... 30 ... 60 ... 90 ... 120 ... 126 127 128 129 130 131 132 ... 150 ... 180 ... 210 ... 240 ... 261 262 263  Next  Last