refactor structure metadata
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
This commit is contained in:
parent
88be49d84a
commit
2d005f4750
@ -19,7 +19,7 @@ import electrosphere.client.terrain.cells.ClientDrawCellManager;
|
|||||||
import electrosphere.client.terrain.foliage.FoliageCellManager;
|
import electrosphere.client.terrain.foliage.FoliageCellManager;
|
||||||
import electrosphere.client.terrain.manager.ClientTerrainManager;
|
import electrosphere.client.terrain.manager.ClientTerrainManager;
|
||||||
import electrosphere.collision.CollisionEngine;
|
import electrosphere.collision.CollisionEngine;
|
||||||
import electrosphere.data.block.fab.StructureData;
|
import electrosphere.data.block.fab.StructureMetadata;
|
||||||
import electrosphere.data.common.CommonEntityType;
|
import electrosphere.data.common.CommonEntityType;
|
||||||
import electrosphere.data.voxel.VoxelType;
|
import electrosphere.data.voxel.VoxelType;
|
||||||
import electrosphere.entity.Entity;
|
import electrosphere.entity.Entity;
|
||||||
@ -191,7 +191,7 @@ public class ClientState {
|
|||||||
/**
|
/**
|
||||||
* The currently selected structure's data
|
* The currently selected structure's data
|
||||||
*/
|
*/
|
||||||
public StructureData currentStructureData;
|
public StructureMetadata currentStructureData;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructor
|
* Constructor
|
||||||
|
|||||||
@ -8,7 +8,7 @@ import electrosphere.client.block.ClientBlockSelection;
|
|||||||
import electrosphere.client.interact.select.AreaSelection;
|
import electrosphere.client.interact.select.AreaSelection;
|
||||||
import electrosphere.data.block.fab.BlockFab;
|
import electrosphere.data.block.fab.BlockFab;
|
||||||
import electrosphere.data.block.fab.BlockFabMetadata;
|
import electrosphere.data.block.fab.BlockFabMetadata;
|
||||||
import electrosphere.data.block.fab.StructureData;
|
import electrosphere.data.block.fab.StructureMetadata;
|
||||||
import electrosphere.engine.Globals;
|
import electrosphere.engine.Globals;
|
||||||
import imgui.ImGui;
|
import imgui.ImGui;
|
||||||
|
|
||||||
@ -36,7 +36,7 @@ public class ImGuiStructureTab {
|
|||||||
BlockFab currentFab = Globals.clientState.clientLevelEditorData.getCurrentFab();
|
BlockFab currentFab = Globals.clientState.clientLevelEditorData.getCurrentFab();
|
||||||
if(Globals.clientState.currentStructureData == null){
|
if(Globals.clientState.currentStructureData == null){
|
||||||
if(ImGui.button("Create Structure Data")){
|
if(ImGui.button("Create Structure Data")){
|
||||||
Globals.clientState.currentStructureData = StructureData.create(Globals.cursorState.getAreaSelection());
|
Globals.clientState.currentStructureData = StructureMetadata.create(Globals.cursorState.getAreaSelection());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if(Globals.clientState.currentStructureData != null && ImGui.button("Calculate Rooms")){
|
if(Globals.clientState.currentStructureData != null && ImGui.button("Calculate Rooms")){
|
||||||
|
|||||||
@ -15,7 +15,7 @@ import electrosphere.client.scene.ClientWorldData;
|
|||||||
/**
|
/**
|
||||||
* Structure data
|
* Structure data
|
||||||
*/
|
*/
|
||||||
public class StructureData {
|
public class StructureMetadata {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Maximum radius of room in blocks
|
* Maximum radius of room in blocks
|
||||||
@ -38,8 +38,8 @@ public class StructureData {
|
|||||||
* @param boundingArea The bounding area
|
* @param boundingArea The bounding area
|
||||||
* @return The structure data
|
* @return The structure data
|
||||||
*/
|
*/
|
||||||
public static StructureData create(AreaSelection boundingArea){
|
public static StructureMetadata create(AreaSelection boundingArea){
|
||||||
StructureData rVal = new StructureData();
|
StructureMetadata rVal = new StructureMetadata();
|
||||||
rVal.boundingArea = boundingArea;
|
rVal.boundingArea = boundingArea;
|
||||||
return rVal;
|
return rVal;
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user