2384: Brushes created by CSG merging faces should go in the parent of the first selected brush #2387
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… of the first selected face.
…aces are added to the first face's parent.
ghost
assigned 
ericwa
approved these changes
Oct 29, 2018
robrohan
added a commit
to TheRohans/TrenchBroom
that referenced
this pull request
Nov 27, 2018
* 2336: Add a way to enter the desired bounds to scale to (TrenchBroom#2353) * 2336: add a way to enter the desired bounds to scale to Fixes TrenchBroom#2336 * 2352: avoid xvfb race condition * 2336: fix warning * 2345: Daikatana config fixes (TrenchBroom#2356) * 2345: updated Daikatana GameConfig.cfg from Sinihopea * 2345: fix typo (mosterclip). Group "NPC clip" with other clip types * 2345: mark 134217728 as detail * 2349: Rotation angle is automatically rounded (TrenchBroom#2359) * 2349: Use auto. * 2349: Allow up to 4 digits for rotation angle spinner. * 2355: Crash to desktop with specific map files (TrenchBroom#2358) * 2355: Use different heuristic to determine subtree for AABB tree insertion * 2355: Fix failing test. * Added slider to set the RendererFontSize preference (TrenchBroom#2347) * Added slider to set the RendererFontSize preference * Changed wxSlider to wxComboBox * * Constrain font size between between 6 and 72 * Use a vector instead of a normal array * Added <wx/valnum.h> to Prefix.h * Add static cast to quiet compiler * Change font limit to 1-96 * Clear font cache when preferences change to avoid memory leak * Only update font cache if the font size is changed * 2361: Crash when adjusting edges/faces (TrenchBroom#2372) * 2361: Add failing test case. * 2361: Add support for zooming the camera in the 3D view. * 2361: Heal edges shorter than 0.01. * 2361: Add stream output operators. * 2361: Invert zoom direction. * 2361: Minor change. * 2361: Formatting, docs. * 2361: Minor changes. * 2361: Remove code to remove vertices, use convex hull instead. * 2361: Implement fov slider, camera zoom reset, and update manual. * 2361: Use default shortcuts when generating the shortcut map. * 2361: Review comments. * 2361: Add failing test, use auto. * 2361: Only heal short edges when a brush could be built completely. * Remove palette.lmp. * 2371: Repair invalid entity definition bounds. (TrenchBroom#2375) * 2263: Ensure fails loading quoth mdl + builtin FGD (TrenchBroom#2374) * 2263: Clamp skin and frame indices. * 2363: Guard against missing skins. * 2363: Minor changes. * 2363: Improve error message when failing to build entity renderer. * 2363: Fix build errors. * 2368: Don't consider invalid merge targets. (TrenchBroom#2376) * 2368: Don't consider invalid merge targets. * 2368: Minor changes. * 2368: Fix build errors. * 2368: Add documentation. * 2381: Don't crash when palette cannot be found. (TrenchBroom#2382) * 2380: Fix reading animated MDL skin groups. (TrenchBroom#2383) * 2380: Remove unused import. * 2380: Fix reading animated skin groups. * 2384: Brushes created by CSG merging faces should go in the parent of the first selected brush (TrenchBroom#2387) * 2384: Brushes created by convex merging faces are added to the parent of the first selected face. * 2384: Add failing test, ensure that brushes added by convex merging faces are added to the first face's parent. * 2384: Code style. * 2385: With clip tool active, texture changes dont occur until you exit the tool or place a clip point (TrenchBroom#2388) * 2385: Code style * 2385: Update clip brushes when their faces change. * 2389: Fix a few interface rendering problems (TrenchBroom#2390) * 2389: Make texture lock icon more prominent. * 2389: Add 4 pixel spacer between icon and text in image list boxes. * 2389: Add more vertical space for empty text label in control list box. * 2389: Refactor and improve rendering of bitmap buttons. * 2389: Cosmetic changes. * 2389: Use correct size for texture lock toolbar icons. * 2389: Fix minor problems. * 2389: Don't use white background for entity property grid buttons. * 2351: UV Lock (TrenchBroom#2386) * 2351: add pointsTransformationMatrix() to find xform between two sets of points * 2351: move to mat_ext.h * 2351: refactor UVListsEqual() test helper * 2351: fix overly lenient UVListsEqual * 2351: add VectorUtils::map() * 8351: add test (failing) * 8351: add lockTexture argument to the vertex manip methods * 8351: move FaceMatchingCallback to a lambda * 2351: mat.h: make the 3x3 and 4x4 constructors only work on 3x3/4x4 matrices * 2351: first sign of working * 2351: improve test * 2351: "LUP decomposition" from "Introduction to Algorithms" 2nd ed. * 2351: use lupSolve in pointsTransformationMatrix * 2351: add UI for UV Lock * 2351: remove unneeded arg from transformTexture() * 2351: add nan check * 2351: fix on standard format maps * 2351: document matrix functions * 2351: make the UV lock test parameterized to test Standard and Valve * 2351: undo unneeded change * 2351: reorganize UV lock * 2351: remove unused function * 2351: add documentation * 2351: factor out the UV lock code to a function. Document stuff. * 2351: suppress INSTANTIATE_TEST_CASE_P warning google/googletest#1419 * 2351: Brush: rename textureLock to uvLock where applicable * 2351: add vertex tool page * Revert "2351: add UI for UV Lock" This reverts commit 950422b. * 2351: redesign UI * 2351: clean up debugging code * 2351: tweaking UV lock heuristic * 2351: review comments * 2351: add manual section for uv lock * 2351: move docs back to header, tweak comments * 2369: request vsync on Windows (TrenchBroom#2392) * 2369: add some debug logging * 2369: enable vsync on Windows * Revert "2369: add some debug logging" This reverts commit b2f54e1. * 2391: Quick fix menu broken on windows. (TrenchBroom#2393) * 2391: Attach event handler to popup menu instead of sub menu. * 2391: Restore functionality on macOS. * 2394: add missing invalidateVertexCache() calls (TrenchBroom#2395) Fixes TrenchBroom#2394 * 2396: Add wxWidgets patch to fix issue where wxTextCtrl::ChangeValue would send change events. (TrenchBroom#2405) * 2402: Add mapversion and MaxRange properties when creating a new Valve map. (TrenchBroom#2403) * 2402: Add mapversion and MaxRange properties when creating a new Valve map. * 2402: Don't add MaxRange to new valve maps. * 2401: Disable reload point / portal file menu items if the files are deleted. (TrenchBroom#2404) * 2407: fix space in Hexen2FileSerializer (TrenchBroom#2408) fixes TrenchBroom#2407 * 2410: Use hints when possible and some UI cleanups. (TrenchBroom#2411) * Add up/down keys to Fly Mode docs (TrenchBroom#2416) * add up/down keys to Fly Mode docs * Update shortcuts map. * 2417: launch xvfb-run with -a so it uses another X server ID if 99 is (TrenchBroom#2418) in use from a previous command. fixes TrenchBroom#2417 * 2399: fix mip size calculation in TextureReader (TrenchBroom#2406) * 2399: fix mip size calculation * 2399: make CharArrayReader throw exceptions when bounds checks fail * 2399: handle corrupt wads better in MipTextureReader::doReadTexture * 2399: add CharArrayReaderTest * 2399: allow seeking to beginning/end. Fix eof() * 2417: launch xvfb-run with -a so it uses another X server ID if 99 is in use from a previous command. fixes TrenchBroom#2417 * 2399: TextureReader: document doReadTexture interface * TrenchBroom#2420: TrenchBroom Manual is now responsive (TrenchBroom#2419) * Updated 'default.css' file in order to visually tweak the compiled manual. * Fixed not well aligned floating headings. * 'template.html' file is now HTML5 certified. * Fixed 'margin-bottom' for '<dl></dl>' tags. * Table headers have their content aligned to the left. * Fixed incorrect 'section' and 'main' padding. * Applied commented fixes. * 2398: fix for vec3f::NaN == any vec3f returning true (TrenchBroom#2422) Fixes TrenchBroom#2398 * 2397: rewrite Camera pitch limit (TrenchBroom#2423) * 2398: fix for vec3f::NaN == any vec3f returning true Fixes TrenchBroom#2398 * 2397: add some tests * 2397: refactor "pitch limit" for orbit and rotation. make more robust, hopefully * 2397: further refactoring * 2432: change texture end value in Bsp29Parser to use the end of the (TrenchBroom#2433) bsp file Fixes TrenchBroom#2432 * 2448: work around ambiguous redirect in bash script (TrenchBroom#2449) * 2438: avoid accessing preferences from FlyModeHelper thread (TrenchBroom#2447) * 2434: Fly mode is choppy on macOS (and possibly Windows) (TrenchBroom#2450) * 2434: Use wxTimer instead of wxThread in FlyModeHelper. * 2434: Disallow tools if they cannot be enabled. * 2434: Rename FlyModeHelper::m_enabled to avoid shadowing a variable in wxTimer. * 2434: Remove fly mode. * 2434: Don't refresh 3D view when camera changes due to fly mode. * 2445: Clamp zoomed fov. (TrenchBroom#2451) * 2434: Use one shot timer. * 2357: Can drag map view pane splitters outside of the window (TrenchBroom#2453) * 2357: Code style. * 2357: Increase splitter handle size, fix max vertical splitter position. * 2357: Code style. * 2434: Increase WASD framerate. (TrenchBroom#2456) * 2434: Increase WASD framerate. * 2434: Set timer resolution to 10ms. * 2434: Use idle events instead of timer for WASD. * 2434: Remove unused import. * 2424: Add support for pk3 files (TrenchBroom#2455) * 2424: Add zip filesystem * 2424: Enable zip file system * 2424: Fix a clang warning. * 2424: Minor optimization. * 2457: fix excessive CPU use in Preferences window (TrenchBroom#2462) To check if it's necessary to call Enable() the right check is IsThisEnabled(). IsEnabled() includes a test of whether the parents are enabled, so if a parent is disabled, this code was leading to Enable(event.GetEnabled()); Refresh(); being called continually. Fixes TrenchBroom#2457 * 2459: Fix handling of embedded palettes when reading daikatana wals. (TrenchBroom#2460) * 2459: Fix handling of embedded palettes when reading daikatana wals. * 2459: Return placeholder texture instead of nullptr if texture cannot be loaded due to missing palettes. * 2459: Don't expect null textures when reading dkm model skins. * 2459: Remove special handling of Daikatana palettes and use embedded palettes for textures instead. * 2459: Ignore global palette in Daikatana wal files. * 2459: Never return nullptr from texture loaders. * 2463: Add support for fence textures to dkwal texture loader (TrenchBroom#2464) * 2459: Fix handling of embedded palettes when reading daikatana wals. * 2459: Return placeholder texture instead of nullptr if texture cannot be loaded due to missing palettes. * 2459: Don't expect null textures when reading dkm model skins. * 2459: Remove special handling of Daikatana palettes and use embedded palettes for textures instead. * 2459: Ignore global palette in Daikatana wal files. * 2459: Never return nullptr from texture loaders. * 2463: Don't generate mipmaps for masked textures and force GL_NEAREST filtering. * 2463: Documentation and minor refactoring. * 2465: Update Windows build instructions and remove need to edit PATH (TrenchBroom#2466) * 2465: Update Windows build instructions and remove need to edit PATH I ran in to some snags setting up a new Windows 10 / VS2017 machine to compile TB and have a few minor fixes: - Update the list of components you need to choose in the VS installer - Clarify that you must specify CMAKE_BUILD_TYPE on the command line (I neglected this and got a weird linker error where the code was compiled against the debug CRT but not linked to it). - Also set up the TrenchBroom target to copy in the wxWidgets DLL's so you don't need to modify PATH - Specify the wxWidgets path on the cmake command line, rather than using WXWIN environment variable fixes TrenchBroom#2465 * 2465: suggest putting wxWidgets next to TB directory
robrohan
added a commit
to TheRohans/TrenchBroom
that referenced
this pull request
Dec 3, 2018
* 2336: Add a way to enter the desired bounds to scale to (TrenchBroom#2353) * 2336: add a way to enter the desired bounds to scale to Fixes TrenchBroom#2336 * 2352: avoid xvfb race condition * 2336: fix warning * 2345: Daikatana config fixes (TrenchBroom#2356) * 2345: updated Daikatana GameConfig.cfg from Sinihopea * 2345: fix typo (mosterclip). Group "NPC clip" with other clip types * 2345: mark 134217728 as detail * 2349: Rotation angle is automatically rounded (TrenchBroom#2359) * 2349: Use auto. * 2349: Allow up to 4 digits for rotation angle spinner. * 2355: Crash to desktop with specific map files (TrenchBroom#2358) * 2355: Use different heuristic to determine subtree for AABB tree insertion * 2355: Fix failing test. * Added slider to set the RendererFontSize preference (TrenchBroom#2347) * Added slider to set the RendererFontSize preference * Changed wxSlider to wxComboBox * * Constrain font size between between 6 and 72 * Use a vector instead of a normal array * Added <wx/valnum.h> to Prefix.h * Add static cast to quiet compiler * Change font limit to 1-96 * Clear font cache when preferences change to avoid memory leak * Only update font cache if the font size is changed * 2361: Crash when adjusting edges/faces (TrenchBroom#2372) * 2361: Add failing test case. * 2361: Add support for zooming the camera in the 3D view. * 2361: Heal edges shorter than 0.01. * 2361: Add stream output operators. * 2361: Invert zoom direction. * 2361: Minor change. * 2361: Formatting, docs. * 2361: Minor changes. * 2361: Remove code to remove vertices, use convex hull instead. * 2361: Implement fov slider, camera zoom reset, and update manual. * 2361: Use default shortcuts when generating the shortcut map. * 2361: Review comments. * 2361: Add failing test, use auto. * 2361: Only heal short edges when a brush could be built completely. * Remove palette.lmp. * 2371: Repair invalid entity definition bounds. (TrenchBroom#2375) * 2263: Ensure fails loading quoth mdl + builtin FGD (TrenchBroom#2374) * 2263: Clamp skin and frame indices. * 2363: Guard against missing skins. * 2363: Minor changes. * 2363: Improve error message when failing to build entity renderer. * 2363: Fix build errors. * 2368: Don't consider invalid merge targets. (TrenchBroom#2376) * 2368: Don't consider invalid merge targets. * 2368: Minor changes. * 2368: Fix build errors. * 2368: Add documentation. * 2381: Don't crash when palette cannot be found. (TrenchBroom#2382) * 2380: Fix reading animated MDL skin groups. (TrenchBroom#2383) * 2380: Remove unused import. * 2380: Fix reading animated skin groups. * 2384: Brushes created by CSG merging faces should go in the parent of the first selected brush (TrenchBroom#2387) * 2384: Brushes created by convex merging faces are added to the parent of the first selected face. * 2384: Add failing test, ensure that brushes added by convex merging faces are added to the first face's parent. * 2384: Code style. * 2385: With clip tool active, texture changes dont occur until you exit the tool or place a clip point (TrenchBroom#2388) * 2385: Code style * 2385: Update clip brushes when their faces change. * 2389: Fix a few interface rendering problems (TrenchBroom#2390) * 2389: Make texture lock icon more prominent. * 2389: Add 4 pixel spacer between icon and text in image list boxes. * 2389: Add more vertical space for empty text label in control list box. * 2389: Refactor and improve rendering of bitmap buttons. * 2389: Cosmetic changes. * 2389: Use correct size for texture lock toolbar icons. * 2389: Fix minor problems. * 2389: Don't use white background for entity property grid buttons. * 2351: UV Lock (TrenchBroom#2386) * 2351: add pointsTransformationMatrix() to find xform between two sets of points * 2351: move to mat_ext.h * 2351: refactor UVListsEqual() test helper * 2351: fix overly lenient UVListsEqual * 2351: add VectorUtils::map() * 8351: add test (failing) * 8351: add lockTexture argument to the vertex manip methods * 8351: move FaceMatchingCallback to a lambda * 2351: mat.h: make the 3x3 and 4x4 constructors only work on 3x3/4x4 matrices * 2351: first sign of working * 2351: improve test * 2351: "LUP decomposition" from "Introduction to Algorithms" 2nd ed. * 2351: use lupSolve in pointsTransformationMatrix * 2351: add UI for UV Lock * 2351: remove unneeded arg from transformTexture() * 2351: add nan check * 2351: fix on standard format maps * 2351: document matrix functions * 2351: make the UV lock test parameterized to test Standard and Valve * 2351: undo unneeded change * 2351: reorganize UV lock * 2351: remove unused function * 2351: add documentation * 2351: factor out the UV lock code to a function. Document stuff. * 2351: suppress INSTANTIATE_TEST_CASE_P warning google/googletest#1419 * 2351: Brush: rename textureLock to uvLock where applicable * 2351: add vertex tool page * Revert "2351: add UI for UV Lock" This reverts commit 950422b. * 2351: redesign UI * 2351: clean up debugging code * 2351: tweaking UV lock heuristic * 2351: review comments * 2351: add manual section for uv lock * 2351: move docs back to header, tweak comments * 2369: request vsync on Windows (TrenchBroom#2392) * 2369: add some debug logging * 2369: enable vsync on Windows * Revert "2369: add some debug logging" This reverts commit b2f54e1. * 2391: Quick fix menu broken on windows. (TrenchBroom#2393) * 2391: Attach event handler to popup menu instead of sub menu. * 2391: Restore functionality on macOS. * 2394: add missing invalidateVertexCache() calls (TrenchBroom#2395) Fixes TrenchBroom#2394 * 2396: Add wxWidgets patch to fix issue where wxTextCtrl::ChangeValue would send change events. (TrenchBroom#2405) * 2402: Add mapversion and MaxRange properties when creating a new Valve map. (TrenchBroom#2403) * 2402: Add mapversion and MaxRange properties when creating a new Valve map. * 2402: Don't add MaxRange to new valve maps. * 2401: Disable reload point / portal file menu items if the files are deleted. (TrenchBroom#2404) * 2407: fix space in Hexen2FileSerializer (TrenchBroom#2408) fixes TrenchBroom#2407 * 2410: Use hints when possible and some UI cleanups. (TrenchBroom#2411) * Add up/down keys to Fly Mode docs (TrenchBroom#2416) * add up/down keys to Fly Mode docs * Update shortcuts map. * 2417: launch xvfb-run with -a so it uses another X server ID if 99 is (TrenchBroom#2418) in use from a previous command. fixes TrenchBroom#2417 * 2399: fix mip size calculation in TextureReader (TrenchBroom#2406) * 2399: fix mip size calculation * 2399: make CharArrayReader throw exceptions when bounds checks fail * 2399: handle corrupt wads better in MipTextureReader::doReadTexture * 2399: add CharArrayReaderTest * 2399: allow seeking to beginning/end. Fix eof() * 2417: launch xvfb-run with -a so it uses another X server ID if 99 is in use from a previous command. fixes TrenchBroom#2417 * 2399: TextureReader: document doReadTexture interface * TrenchBroom#2420: TrenchBroom Manual is now responsive (TrenchBroom#2419) * Updated 'default.css' file in order to visually tweak the compiled manual. * Fixed not well aligned floating headings. * 'template.html' file is now HTML5 certified. * Fixed 'margin-bottom' for '<dl></dl>' tags. * Table headers have their content aligned to the left. * Fixed incorrect 'section' and 'main' padding. * Applied commented fixes. * 2398: fix for vec3f::NaN == any vec3f returning true (TrenchBroom#2422) Fixes TrenchBroom#2398 * 2397: rewrite Camera pitch limit (TrenchBroom#2423) * 2398: fix for vec3f::NaN == any vec3f returning true Fixes TrenchBroom#2398 * 2397: add some tests * 2397: refactor "pitch limit" for orbit and rotation. make more robust, hopefully * 2397: further refactoring * 2432: change texture end value in Bsp29Parser to use the end of the (TrenchBroom#2433) bsp file Fixes TrenchBroom#2432 * 2448: work around ambiguous redirect in bash script (TrenchBroom#2449) * 2438: avoid accessing preferences from FlyModeHelper thread (TrenchBroom#2447) * 2434: Fly mode is choppy on macOS (and possibly Windows) (TrenchBroom#2450) * 2434: Use wxTimer instead of wxThread in FlyModeHelper. * 2434: Disallow tools if they cannot be enabled. * 2434: Rename FlyModeHelper::m_enabled to avoid shadowing a variable in wxTimer. * 2434: Remove fly mode. * 2434: Don't refresh 3D view when camera changes due to fly mode. * 2445: Clamp zoomed fov. (TrenchBroom#2451) * 2434: Use one shot timer. * 2357: Can drag map view pane splitters outside of the window (TrenchBroom#2453) * 2357: Code style. * 2357: Increase splitter handle size, fix max vertical splitter position. * 2357: Code style. * 2434: Increase WASD framerate. (TrenchBroom#2456) * 2434: Increase WASD framerate. * 2434: Set timer resolution to 10ms. * 2434: Use idle events instead of timer for WASD. * 2434: Remove unused import. * 2424: Add support for pk3 files (TrenchBroom#2455) * 2424: Add zip filesystem * 2424: Enable zip file system * 2424: Fix a clang warning. * 2424: Minor optimization. * 2457: fix excessive CPU use in Preferences window (TrenchBroom#2462) To check if it's necessary to call Enable() the right check is IsThisEnabled(). IsEnabled() includes a test of whether the parents are enabled, so if a parent is disabled, this code was leading to Enable(event.GetEnabled()); Refresh(); being called continually. Fixes TrenchBroom#2457 * 2459: Fix handling of embedded palettes when reading daikatana wals. (TrenchBroom#2460) * 2459: Fix handling of embedded palettes when reading daikatana wals. * 2459: Return placeholder texture instead of nullptr if texture cannot be loaded due to missing palettes. * 2459: Don't expect null textures when reading dkm model skins. * 2459: Remove special handling of Daikatana palettes and use embedded palettes for textures instead. * 2459: Ignore global palette in Daikatana wal files. * 2459: Never return nullptr from texture loaders. * 2463: Add support for fence textures to dkwal texture loader (TrenchBroom#2464) * 2459: Fix handling of embedded palettes when reading daikatana wals. * 2459: Return placeholder texture instead of nullptr if texture cannot be loaded due to missing palettes. * 2459: Don't expect null textures when reading dkm model skins. * 2459: Remove special handling of Daikatana palettes and use embedded palettes for textures instead. * 2459: Ignore global palette in Daikatana wal files. * 2459: Never return nullptr from texture loaders. * 2463: Don't generate mipmaps for masked textures and force GL_NEAREST filtering. * 2463: Documentation and minor refactoring. * 2465: Update Windows build instructions and remove need to edit PATH (TrenchBroom#2466) * 2465: Update Windows build instructions and remove need to edit PATH I ran in to some snags setting up a new Windows 10 / VS2017 machine to compile TB and have a few minor fixes: - Update the list of components you need to choose in the VS installer - Clarify that you must specify CMAKE_BUILD_TYPE on the command line (I neglected this and got a weird linker error where the code was compiled against the debug CRT but not linked to it). - Also set up the TrenchBroom target to copy in the wxWidgets DLL's so you don't need to modify PATH - Specify the wxWidgets path on the cmake command line, rather than using WXWIN environment variable fixes TrenchBroom#2465 * 2465: suggest putting wxWidgets next to TB directory
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #2384