dont select generated bricks; ctrl+select generated bricks selects parent; remove copy

This commit is contained in:
Redo
2025-07-22 17:32:45 -07:00
parent 2084d75180
commit a17e88ab0d
6 changed files with 68 additions and 23 deletions

View File

@ -191,6 +191,8 @@ function NDM_BoxSelect::onSelectObject(%this, %client, %obj, %pos, %normal)
%box = ndGetBoxFromZone(%obj);
%client.ndSelectionBox.zoneBrick = %obj;
%client.ndSelectionBox.setZoneColors();
} else if(%obj.generated && isObject(%obj.generatedParent)) {
%box = %obj.generatedParent.getWorldBox();
} else {
%box = ndGetPlateBoxFromRayCast(%pos, %normal);
}
@ -472,10 +474,10 @@ function NDM_BoxSelect::onCancelBrick(%this, %client)
}
//Copy Selection
function NDM_BoxSelect::onCopy(%this, %client)
{
%this.onPlantBrick(%client);
}
//function NDM_BoxSelect::onCopy(%this, %client)
//{
// %this.onPlantBrick(%client);
//}
//Cut Selection
function NDM_BoxSelect::onCut(%this, %client)

View File

@ -170,10 +170,10 @@ function NDM_StackSelect::onCancelBrick(%this, %client)
}
//Copy Selection
function NDM_StackSelect::onCopy(%this, %client)
{
%this.onPlantBrick(%client);
}
//function NDM_StackSelect::onCopy(%this, %client)
//{
// %this.onPlantBrick(%client);
//}
//Cut Selection
function NDM_StackSelect::onCut(%this, %client)

View File

@ -212,6 +212,10 @@ function ND_Selection::startStackSelection(%this, %brick, %direction, %limited)
if(%queueCount >= %brickLimit)
continue;
// Skip generated bricks
if(%nextBrick.generated)
continue;
//Check trust
if(!ndTrustCheckSelect(%nextBrick, %group, %bl_id, %admin))
{
@ -239,6 +243,10 @@ function ND_Selection::startStackSelection(%this, %brick, %direction, %limited)
if(%queueCount >= %brickLimit)
continue;
// Skip generated bricks
if(%nextBrick.generated)
continue;
//Check trust
if(!ndTrustCheckSelect(%nextBrick, %group, %bl_id, %admin))
{
@ -268,6 +276,10 @@ function ND_Selection::startStackSelection(%this, %brick, %direction, %limited)
if(%queueCount >= %brickLimit)
continue;
// Skip generated bricks
if(%nextBrick.generated)
continue;
//Check trust
if(!ndTrustCheckSelect(%nextBrick, %group, %bl_id, %admin))
{
@ -364,6 +376,10 @@ function ND_Selection::startStackSelectionAdditive(%this, %brick, %direction, %l
if(%queueCount >= %brickLimit)
continue;
// Skip generated bricks
if(%nextBrick.generated)
continue;
//Check trust
if(!ndTrustCheckSelect(%nextBrick, %group, %bl_id, %admin))
{
@ -409,6 +425,10 @@ function ND_Selection::startStackSelectionAdditive(%this, %brick, %direction, %l
if(%queueCount >= %brickLimit)
continue;
// Skip generated bricks
if(%nextBrick.generated)
continue;
//Check trust
if(!ndTrustCheckSelect(%nextBrick, %group, %bl_id, %admin))
{
@ -456,6 +476,10 @@ function ND_Selection::startStackSelectionAdditive(%this, %brick, %direction, %l
if(%queueCount >= %brickLimit)
continue;
// Skip generated bricks
if(%nextBrick.generated)
continue;
//Check trust
if(!ndTrustCheckSelect(%nextBrick, %group, %bl_id, %admin))
{
@ -570,6 +594,10 @@ function ND_Selection::tickStackSelection(%this, %direction, %limited, %heightLi
if(%queueCount >= %brickLimit)
continue;
// Skip generated bricks
if(%nextBrick.generated)
continue;
//Check trust
if(!ndTrustCheckSelect(%nextBrick, %group, %bl_id, %admin))
{
@ -603,6 +631,10 @@ function ND_Selection::tickStackSelection(%this, %direction, %limited, %heightLi
if(%queueCount >= %brickLimit)
continue;
// Skip generated bricks
if(%nextBrick.generated)
continue;
//Check trust
if(!ndTrustCheckSelect(%nextBrick, %group, %bl_id, %admin))
{
@ -652,6 +684,10 @@ function ND_Selection::tickStackSelection(%this, %direction, %limited, %heightLi
if(%queueCount >= %brickLimit)
continue;
// Skip generated bricks
if(%nextBrick.generated)
continue;
//Check trust
if(!ndTrustCheckSelect(%nextBrick, %group, %bl_id, %admin))
{
@ -883,6 +919,10 @@ function ND_Selection::tickBoxSelectionChunk(%this, %limited, %brickLimit)
continue;
}
// Skip generated bricks
if(%obj.generated)
continue;
//Check trust
if(!ndTrustCheckSelect(%obj, %group, %bl_id, %admin))
{