Skip to content

Commit

Permalink
Add book shelf definitions to central atrium tile
Browse files Browse the repository at this point in the history
  • Loading branch information
@Niels-NTG
Niels-NTG committed Jun 14, 2024
1 parent 8bdd760 commit 4cd231b
Show file tree
Hide file tree
Showing 2 changed files with 283 additions and 15 deletions.
27 changes: 13 additions & 14 deletions LibraryFloor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ def __init__(
self.allLockedTiles = dict()
self.allDefaultAdjacencies = dict()
self.subGridVolumes = []
self.placedTiles = dict()

self.volumeGrid = Box(size=volume.size // tileSize)
self.volumeGrid.size = self.volumeGrid.size + ivec3(1, 0, 1)
Expand Down Expand Up @@ -76,10 +77,6 @@ def __init__(
onResolve=self.onResolve,
)

self.placedTiles = dict()
for index, building in self.getCollapsedState:
self.placedTiles[index] = building

def reinitWFC(self, wfc: WaveFunctionCollapse):
self.collapseVolumeEdgeToAir(wfc)
self.collapseCentralAtriumSpace(wfc)
Expand Down Expand Up @@ -219,6 +216,18 @@ def onResolve(self, wfc: WaveFunctionCollapse):
self.allDefaultAdjacencies.update(wfc.defaultAdjacencies)
self.subGridVolumes.append(wfc.stateSpaceBox)

for index, building in self.getCollapsedState:
self.placedTiles[index] = building
# Add central atrium/staircase
atriumCoreFolder = globals.structureFolders['central_core']
atriumCoreBuildingInstance: Structure = atriumCoreFolder.structureClass(
withRotation=self.volumeRotation,
tile=self.atriumBox.offset,
offset=self.volume.offset,
)
self.placedTiles[atriumCoreBuildingInstance.tile] = atriumCoreBuildingInstance
self.centralTile = atriumCoreBuildingInstance.tile

@staticmethod
def removeOrphanedBuildings(wfc: WaveFunctionCollapse):
buildings = wfc.foundBuildings
Expand Down Expand Up @@ -247,16 +256,6 @@ def placeStructure(self, buildVolumeOffset: ivec3 = ivec3(0, 0, 0)):
print('Placing tiles…')
for building in self.placedTiles.values():
building.place()
# Build central atrium/staircase
atriumCoreFolder = globals.structureFolders['central_core']
atriumCoreBuildingInstance: Structure = atriumCoreFolder.structureClass(
withRotation=self.volumeRotation,
tile=ivec3(*self.atriumBox.offset),
offset=buildVolumeOffset,
)
atriumCoreBuildingInstance.place()
self.placedTiles[atriumCoreBuildingInstance.tile] = atriumCoreBuildingInstance
self.centralTile = atriumCoreBuildingInstance.tile

@property
def bookCapacity(self) -> int:
Expand Down
271 changes: 270 additions & 1 deletion structures/doha9/central_core/central_core.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,276 @@

class CentralCore(Structure):

# TODO add bookShelves definition for central core
bookShelves = {
'east1': {
ivec3(7, 4, 13): 'east',
ivec3(7, 4, 12): 'east',
ivec3(7, 4, 11): 'east',
ivec3(7, 4, 10): 'east',
ivec3(7, 4, 9): 'east',
ivec3(7, 3, 13): 'east',
ivec3(7, 3, 12): 'east',
ivec3(7, 3, 11): 'east',
ivec3(7, 3, 10): 'east',
ivec3(7, 3, 9): 'east',
ivec3(7, 2, 13): 'east',
ivec3(7, 2, 12): 'east',
ivec3(7, 2, 11): 'east',
ivec3(7, 2, 10): 'east',
ivec3(7, 2, 9): 'east',
},
'south1': {
ivec3(9, 4, 7): 'south',
ivec3(10, 4, 7): 'south',
ivec3(11, 4, 7): 'south',
ivec3(12, 4, 7): 'south',
ivec3(13, 4, 7): 'south',
ivec3(9, 3, 7): 'south',
ivec3(10, 3, 7): 'south',
ivec3(11, 3, 7): 'south',
ivec3(12, 3, 7): 'south',
ivec3(13, 3, 7): 'south',
ivec3(9, 2, 7): 'south',
ivec3(10, 2, 7): 'south',
ivec3(11, 2, 7): 'south',
ivec3(12, 2, 7): 'south',
ivec3(13, 2, 7): 'south',
},
'south2': {
ivec3(15, 4, 7): 'south',
ivec3(16, 4, 7): 'south',
ivec3(17, 4, 7): 'south',
ivec3(18, 4, 7): 'south',
ivec3(19, 4, 7): 'south',
ivec3(15, 3, 7): 'south',
ivec3(16, 3, 7): 'south',
ivec3(17, 3, 7): 'south',
ivec3(18, 3, 7): 'south',
ivec3(19, 3, 7): 'south',
ivec3(15, 2, 7): 'south',
ivec3(16, 2, 7): 'south',
ivec3(17, 2, 7): 'south',
ivec3(18, 2, 7): 'south',
ivec3(19, 2, 7): 'south',
},
'south3': {
ivec3(25, 4, 7): 'south',
ivec3(26, 4, 7): 'south',
ivec3(27, 4, 7): 'south',
ivec3(28, 4, 7): 'south',
ivec3(29, 4, 7): 'south',
ivec3(25, 3, 7): 'south',
ivec3(26, 3, 7): 'south',
ivec3(27, 3, 7): 'south',
ivec3(28, 3, 7): 'south',
ivec3(29, 3, 7): 'south',
ivec3(25, 2, 7): 'south',
ivec3(26, 2, 7): 'south',
ivec3(27, 2, 7): 'south',
ivec3(28, 2, 7): 'south',
ivec3(29, 2, 7): 'south',
},
'south4': {
ivec3(31, 4, 7): 'south',
ivec3(32, 4, 7): 'south',
ivec3(33, 4, 7): 'south',
ivec3(34, 4, 7): 'south',
ivec3(35, 4, 7): 'south',
ivec3(31, 3, 7): 'south',
ivec3(32, 3, 7): 'south',
ivec3(33, 3, 7): 'south',
ivec3(34, 3, 7): 'south',
ivec3(35, 3, 7): 'south',
ivec3(31, 2, 7): 'south',
ivec3(32, 2, 7): 'south',
ivec3(33, 2, 7): 'south',
ivec3(34, 2, 7): 'south',
ivec3(35, 2, 7): 'south',
},
'west1': {
ivec3(37, 4, 9): 'west',
ivec3(37, 4, 10): 'west',
ivec3(37, 4, 11): 'west',
ivec3(37, 4, 12): 'west',
ivec3(37, 4, 13): 'west',
ivec3(37, 3, 9): 'west',
ivec3(37, 3, 10): 'west',
ivec3(37, 3, 11): 'west',
ivec3(37, 3, 12): 'west',
ivec3(37, 3, 13): 'west',
ivec3(37, 2, 9): 'west',
ivec3(37, 2, 10): 'west',
ivec3(37, 2, 11): 'west',
ivec3(37, 2, 12): 'west',
ivec3(37, 2, 13): 'west',
},
'west2': {
ivec3(37, 4, 15): 'west',
ivec3(37, 4, 16): 'west',
ivec3(37, 4, 17): 'west',
ivec3(37, 4, 18): 'west',
ivec3(37, 4, 19): 'west',
ivec3(37, 3, 15): 'west',
ivec3(37, 3, 16): 'west',
ivec3(37, 3, 17): 'west',
ivec3(37, 3, 18): 'west',
ivec3(37, 3, 19): 'west',
ivec3(37, 2, 15): 'west',
ivec3(37, 2, 16): 'west',
ivec3(37, 2, 17): 'west',
ivec3(37, 2, 18): 'west',
ivec3(37, 2, 19): 'west',
},
'west3': {
ivec3(37, 4, 25): 'west',
ivec3(37, 4, 26): 'west',
ivec3(37, 4, 27): 'west',
ivec3(37, 4, 28): 'west',
ivec3(37, 4, 29): 'west',
ivec3(37, 3, 25): 'west',
ivec3(37, 3, 26): 'west',
ivec3(37, 3, 27): 'west',
ivec3(37, 3, 28): 'west',
ivec3(37, 3, 29): 'west',
ivec3(37, 2, 25): 'west',
ivec3(37, 2, 26): 'west',
ivec3(37, 2, 27): 'west',
ivec3(37, 2, 28): 'west',
ivec3(37, 2, 29): 'west',
},
'west4': {
ivec3(37, 4, 31): 'west',
ivec3(37, 4, 32): 'west',
ivec3(37, 4, 33): 'west',
ivec3(37, 4, 34): 'west',
ivec3(37, 4, 35): 'west',
ivec3(37, 3, 31): 'west',
ivec3(37, 3, 32): 'west',
ivec3(37, 3, 33): 'west',
ivec3(37, 3, 34): 'west',
ivec3(37, 3, 35): 'west',
ivec3(37, 2, 31): 'west',
ivec3(37, 2, 32): 'west',
ivec3(37, 2, 33): 'west',
ivec3(37, 2, 34): 'west',
ivec3(37, 2, 35): 'west',
},
'north1': {
ivec3(35, 4, 37): 'north',
ivec3(34, 4, 37): 'north',
ivec3(33, 4, 37): 'north',
ivec3(32, 4, 37): 'north',
ivec3(31, 4, 37): 'north',
ivec3(35, 3, 37): 'north',
ivec3(34, 3, 37): 'north',
ivec3(33, 3, 37): 'north',
ivec3(32, 3, 37): 'north',
ivec3(31, 3, 37): 'north',
ivec3(35, 2, 37): 'north',
ivec3(34, 2, 37): 'north',
ivec3(33, 2, 37): 'north',
ivec3(32, 2, 37): 'north',
ivec3(31, 2, 37): 'north',
},
'north2': {
ivec3(29, 4, 37): 'north',
ivec3(28, 4, 37): 'north',
ivec3(27, 4, 37): 'north',
ivec3(26, 4, 37): 'north',
ivec3(25, 4, 37): 'north',
ivec3(29, 3, 37): 'north',
ivec3(28, 3, 37): 'north',
ivec3(27, 3, 37): 'north',
ivec3(26, 3, 37): 'north',
ivec3(25, 3, 37): 'north',
ivec3(29, 2, 37): 'north',
ivec3(28, 2, 37): 'north',
ivec3(27, 2, 37): 'north',
ivec3(26, 2, 37): 'north',
ivec3(25, 2, 37): 'north',
},
'north3': {
ivec3(19, 4, 37): 'north',
ivec3(18, 4, 37): 'north',
ivec3(17, 4, 37): 'north',
ivec3(16, 4, 37): 'north',
ivec3(15, 4, 37): 'north',
ivec3(19, 3, 37): 'north',
ivec3(18, 3, 37): 'north',
ivec3(17, 3, 37): 'north',
ivec3(16, 3, 37): 'north',
ivec3(15, 3, 37): 'north',
ivec3(19, 2, 37): 'north',
ivec3(18, 2, 37): 'north',
ivec3(17, 2, 37): 'north',
ivec3(16, 2, 37): 'north',
ivec3(15, 2, 37): 'north',
},
'north4': {
ivec3(13, 4, 37): 'north',
ivec3(12, 4, 37): 'north',
ivec3(11, 4, 37): 'north',
ivec3(10, 4, 37): 'north',
ivec3(9, 4, 37): 'north',
ivec3(13, 3, 37): 'north',
ivec3(12, 3, 37): 'north',
ivec3(11, 3, 37): 'north',
ivec3(10, 3, 37): 'north',
ivec3(9, 3, 37): 'north',
ivec3(13, 2, 37): 'north',
ivec3(12, 2, 37): 'north',
ivec3(11, 2, 37): 'north',
ivec3(10, 2, 37): 'north',
ivec3(9, 2, 37): 'north',
},
'east2': {
ivec3(7, 4, 35): 'east',
ivec3(7, 4, 34): 'east',
ivec3(7, 4, 33): 'east',
ivec3(7, 4, 32): 'east',
ivec3(7, 4, 31): 'east',
ivec3(7, 3, 35): 'east',
ivec3(7, 3, 34): 'east',
ivec3(7, 3, 33): 'east',
ivec3(7, 3, 32): 'east',
ivec3(7, 3, 31): 'east',
ivec3(7, 2, 35): 'east',
ivec3(7, 2, 34): 'east',
ivec3(7, 2, 33): 'east',
ivec3(7, 2, 32): 'east',
ivec3(7, 2, 31): 'east',
},
}

signs = {
'east1': ivec3(8, 6, 11),
'south1': ivec3(11, 6, 8),
'south2': ivec3(17, 6, 8),
'south3': ivec3(27, 6, 8),
'south4': ivec3(33, 6, 8),
'west1': ivec3(36, 6, 11),
'west2': ivec3(36, 6, 17),
'west3': ivec3(36, 6, 27),
'west4': ivec3(36, 6, 33),
'north1': ivec3(33, 6, 36),
'north2': ivec3(27, 6, 36),
'north3': ivec3(17, 6, 36),
'north4': ivec3(11, 6, 36),
'east2': ivec3(8, 6, 33),
'up1': ivec3(8, 6, 27),
'up2': ivec3(8, 5, 27),
'down1': ivec3(8, 6, 17),
'down2': ivec3(8, 5, 17),
'floor1': ivec3(7, 3, 23),
'floor2': ivec3(7, 3, 24),
'floor3': ivec3(7, 3, 25),
'south_hallway1': ivec3(21, 5, 7),
'south_hallway2': ivec3(23, 5, 7),
'west_hallway1': ivec3(37, 5, 21),
'west_hallway2': ivec3(37, 5, 23),
'north_hallway1': ivec3(23, 5, 37),
'north_hallway2': ivec3(21, 5, 77),
}

def __init__(
self,
Expand Down

0 comments on commit 4cd231b

Please sign in to comment.