ExMods/extracommands
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix move so connected cubes are moved (UNTESTED)

Browse source
This commit is contained in:
NGnius (Graham) 2019-11-18 15:37:02 -05:00
parent 9e3b09f1f9
commit d2a870b95c
1 changed files with 45 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

98
extracommands/MoveBlocksCommandEngine.cs
View file

@ -2,10 +2,12 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using RobocraftX.Multiplayer; using RobocraftX.Multiplayer;
using RobocraftX.Common; using RobocraftX.Common;
using RobocraftX.Blocks;
using Svelto.ECS; using Svelto.ECS;
using Svelto.ECS.EntityStructs; using Svelto.ECS.EntityStructs;
using Unity.Entities; using Unity.Entities;
using Svelto.Context; using Svelto.Context;
using Svelto.DataStructures;
using Svelto.Tasks; using Svelto.Tasks;
using RobocraftX; using RobocraftX;
using RobocraftX.SimulationModeState; using RobocraftX.SimulationModeState;
@ -37,37 +39,13 @@ namespace ExtraCommands.Building
uREPL.Log.Error("Blocks can only be moved in Build Mode"); uREPL.Log.Error("Blocks can only be moved in Build Mode");
return; return;
} }
uint posCount, gridCount, transCount, phyCount; uint count = this.entitiesDB.Count<PositionEntityStruct>(CommonExclusiveGroups.OWNED_BLOCKS_GROUP);
PositionEntityStruct[] posStructs = this.entitiesDB.QueryEntities<PositionEntityStruct>(CommonExclusiveGroups.OWNED_BLOCKS_GROUP, out posCount); float3 translationVector = new float3(x,y,z);
GridRotationStruct[] gridStructs = this.entitiesDB.QueryEntities<GridRotationStruct>(CommonExclusiveGroups.OWNED_BLOCKS_GROUP, out gridCount); for (uint i = 0; i < count; i++)
LocalTransformEntityStruct[] transStructs = this.entitiesDB.QueryEntities<LocalTransformEntityStruct>(CommonExclusiveGroups.OWNED_BLOCKS_GROUP, out transCount);
UECSPhysicsEntityStruct[] phyStructs = this.entitiesDB.QueryEntities<UECSPhysicsEntityStruct>(CommonExclusiveGroups.OWNED_BLOCKS_GROUP, out phyCount);
if (posCount != gridCount || gridCount != transCount || transCount != phyCount)
{ {
uREPL.Log.Error("Block lists returned are not the same length!"); // they're arrays, not lists TranslateSingleBlock(i, translationVector);
return;
} }
for (uint i = 0; i < posCount; i++) uREPL.Log.Output($"Moved {count} blocks");
{
ref PositionEntityStruct posStruct = ref posStructs[i]; // main (persistent) position
posStruct.position.x += x;
posStruct.position.y += y;
posStruct.position.z += z;
ref GridRotationStruct gridStruct = ref gridStructs[i]; // main (persistent) position
gridStruct.position.x += x;
gridStruct.position.y += y;
gridStruct.position.z += z;
ref LocalTransformEntityStruct transStruct = ref transStructs[i]; // rendered position
transStruct.position.x += x;
transStruct.position.y += y;
transStruct.position.z += z;
ref UECSPhysicsEntityStruct phyStruct = ref phyStructs[i]; // collision position
this.physWorld.EntityManager.SetComponentData(phyStruct.uecsEntity, new Translation
{
Value = posStruct.position
});
}
uREPL.Log.Output($"Moved {posCount} blocks");
} }
// Move block with highest index by vector (x,y,z) // Move block with highest index by vector (x,y,z)
@ -79,34 +57,48 @@ namespace ExtraCommands.Building
uREPL.Log.Error("Blocks can only be moved in Build Mode"); uREPL.Log.Error("Blocks can only be moved in Build Mode");
return; return;
} }
uint posCount, gridCount, transCount, phyCount; uint count = this.entitiesDB.Count<PositionEntityStruct>(CommonExclusiveGroups.OWNED_BLOCKS_GROUP);
PositionEntityStruct[] posStructs = this.entitiesDB.QueryEntities<PositionEntityStruct>(CommonExclusiveGroups.OWNED_BLOCKS_GROUP, out posCount); float3 newPos = TranslateConnectedBlocks(count-1, new float3(x,y,z));
GridRotationStruct[] gridStructs = this.entitiesDB.QueryEntities<GridRotationStruct>(CommonExclusiveGroups.OWNED_BLOCKS_GROUP, out gridCount); uREPL.Log.Output($"Moved block to ({newPos.x},{newPos.y},{newPos.z})");
LocalTransformEntityStruct[] transStructs = this.entitiesDB.QueryEntities<LocalTransformEntityStruct>(CommonExclusiveGroups.OWNED_BLOCKS_GROUP, out transCount); }
UECSPhysicsEntityStruct[] phyStructs = this.entitiesDB.QueryEntities<UECSPhysicsEntityStruct>(CommonExclusiveGroups.OWNED_BLOCKS_GROUP, out phyCount);
if (posCount == 0 || transCount == 0 || phyCount == 0) // Move the block denoted by blockID by translationVector (old_position += translationVector)
{ private float3 TranslateSingleBlock(uint blockID, float3 translationVector)
uREPL.Log.Error("No block found"); {
return; ref PositionEntityStruct posStruct = ref this.entitiesDB.QueryEntity<PositionEntityStruct>(blockID, CommonExclusiveGroups.OWNED_BLOCKS_GROUP);
} ref GridRotationStruct gridStructs = this.entitiesDB.QueryEntity<GridRotationStruct>(blockID, CommonExclusiveGroups.OWNED_BLOCKS_GROUP);
ref PositionEntityStruct posStruct = ref posStructs[posCount-1]; // main (persistent) position ref LocalTransformEntityStruct transStructs = this.entitiesDB.QueryEntity<LocalTransformEntityStruct>(blockID, CommonExclusiveGroups.OWNED_BLOCKS_GROUP);
posStruct.position.x += x; ref UECSPhysicsEntityStruct phyStructs = this.entitiesDB.QueryEntity<UECSPhysicsEntityStruct>(blockID, CommonExclusiveGroups.OWNED_BLOCKS_GROUP);
posStruct.position.y += y; // main (persistent) position
posStruct.position.z += z; posStruct.position.x += translationVector.x;
ref GridRotationStruct gridStruct = ref gridStructs[gridCount-1]; // main (persistent) position posStruct.position.y += translationVector.y;
gridStruct.position.x += x; posStruct.position.z += translationVector.z;
gridStruct.position.y += y; // placement grid position
gridStruct.position.z += z; gridStruct.position.x += translationVector.x;
ref LocalTransformEntityStruct transStruct = ref transStructs[transCount-1]; // rendered position gridStruct.position.y += translationVector.y;
transStruct.position.x += x; gridStruct.position.z += translationVector.z;
transStruct.position.y += y; // rendered position
transStruct.position.z += z; transStruct.position.x += translationVector.x;
ref UECSPhysicsEntityStruct phyStruct = ref phyStructs[phyCount-1]; // collision position transStruct.position.y += translationVector.y;
transStruct.position.z += translationVector.z;
// collision position
this.physWorld.EntityManager.SetComponentData(phyStruct.uecsEntity, new Translation this.physWorld.EntityManager.SetComponentData(phyStruct.uecsEntity, new Translation
{ {
Value = posStruct.position Value = posStruct.position
}); });
uREPL.Log.Output($"Moved block to ({posStruct.position.x},{posStruct.position.y},{posStruct.position.z})"); return posStruct.position;
}
private void TranslateConnectedBlocks(uint blockID, float3 translationVector)
{
uint count = this.entitiesDB.Count<PositionEntityStruct>(CommonExclusiveGroups.OWNED_BLOCKS_GROUP);
Stack<uint> cubeStack = new Stack<uint>(count);
FasterList<uint> cubeList = new FasterList<uint>(count);
ConnectedCubesUtility.TreeTraversal.GetConnectedCubes(this.entitiesDB, blockID, cubeStack, cubeList, false /*unused*/);
foreach (uint id in FasterList.ToArrayFast(cubeList))
{
TranslateSingleBlock(id, translationVector);
}
} }
// unused; for future reference // unused; for future reference