quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Radiant:

Browse Source 
misc...
	* CSG Tool
	* fix: texbro: blured stipple with green and red borders
This commit is contained in:
Garux
2017-08-01 14:26:18 +03:00
parent 6592d65469
commit 7ca59bef0a
13 changed files with 618 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
radiant/patchmanip.cpp
View File

@@ -199,27 +199,27 @@ void Scene_PatchDeform( scene::Graph& graph, const int deform )
void Patch_thicken( Patch& patch, scene::Instance& instance, const float thickness, bool seams, const int axis ){
// Create a new patch node
NodeSmartReference node(g_patchCreator->createPatch());
NodeSmartReference node( g_patchCreator->createPatch() );
// Insert the node into worldspawn
Node_getTraversable(Map_FindOrInsertWorldspawn(g_map))->insert(node);
Node_getTraversable( Map_FindOrInsertWorldspawn( g_map ) )->insert( node );
// Retrieve the contained patch from the node
Patch* targetPatch = Node_getPatch(node);
Patch* targetPatch = Node_getPatch( node );
// Create the opposite patch with the given thickness = distance
bool no12 = true;
bool no34 = true;
targetPatch->createThickenedOpposite(patch, thickness, axis, no12, no34);
targetPatch->createThickenedOpposite( patch, thickness, axis, no12, no34 );
// Now select the newly created patches
{
scene::Path patchpath(makeReference(GlobalSceneGraph().root()));
patchpath.push(makeReference(*Map_GetWorldspawn(g_map)));
patchpath.push(makeReference(node.get()));
Instance_getSelectable(*GlobalSceneGraph().find(patchpath))->setSelected(true);
scene::Path patchpath( makeReference( GlobalSceneGraph().root() ) );
patchpath.push( makeReference( *Map_GetWorldspawn( g_map ) ) );
patchpath.push( makeReference( node.get() ) );
Instance_getSelectable( *GlobalSceneGraph().find( patchpath ) )->setSelected( true );
}
if (seams && thickness != 0.0f) {
if( seams && thickness != 0.0f){
int i = 0;
if ( no12 ){
i = 2;
@@ -229,31 +229,31 @@ void Patch_thicken( Patch& patch, scene::Instance& instance, const float thickne
iend = 2;
}
// Now create the four walls
for ( ; i < iend; i++ ) {
for ( ; i < iend; i++ ){
// Allocate new patch
NodeSmartReference node = NodeSmartReference(g_patchCreator->createPatch());
NodeSmartReference node = NodeSmartReference( g_patchCreator->createPatch() );
// Insert each node into worldspawn
Node_getTraversable(Map_FindOrInsertWorldspawn(g_map))->insert(node);
Node_getTraversable( Map_FindOrInsertWorldspawn( g_map ) )->insert( node );
// Retrieve the contained patch from the node
Patch* wallPatch = Node_getPatch(node);
Patch* wallPatch = Node_getPatch( node );
// Create the wall patch by passing i as wallIndex
wallPatch->createThickenedWall( patch, *targetPatch, i);
wallPatch->createThickenedWall( patch, *targetPatch, i );
if( ( wallPatch->localAABB().extents[0] <= 0.00005 && wallPatch->localAABB().extents[1] <= 0.00005 ) ||
( wallPatch->localAABB().extents[1] <= 0.00005 && wallPatch->localAABB().extents[2] <= 0.00005 ) ||
( wallPatch->localAABB().extents[0] <= 0.00005 && wallPatch->localAABB().extents[2] <= 0.00005 ) ){
//globalOutputStream() << "Thicken: Discarding degenerate patch.\n";
Node_getTraversable( Map_FindOrInsertWorldspawn(g_map) )->erase( node );
Node_getTraversable( Map_FindOrInsertWorldspawn( g_map ) )->erase( node );
}
else
// Now select the newly created patches
{
scene::Path patchpath(makeReference(GlobalSceneGraph().root()));
patchpath.push(makeReference(*Map_GetWorldspawn(g_map)));
patchpath.push(makeReference(node.get()));
Instance_getSelectable(*GlobalSceneGraph().find(patchpath))->setSelected(true);
scene::Path patchpath( makeReference( GlobalSceneGraph().root() ) );
patchpath.push( makeReference( *Map_GetWorldspawn(g_map) ) );
patchpath.push( makeReference( node.get() ) );
Instance_getSelectable( *GlobalSceneGraph().find( patchpath ) )->setSelected( true );
}
}
}