mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2025-07-18 18:23:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow placement options for pieces

Browse Source
This commit is contained in:
Daniel Mills 2021-01-12 05:55:27 -05:00
parent b7b15a8f7b
commit 1493beb79b
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/volmit/iris/object/IrisJigsawPiece.java
View File

@ -1,5 +1,6 @@
package com.volmit.iris.object; package com.volmit.iris.object;
import com.google.gson.Gson;
import com.volmit.iris.scaffold.cache.AtomicCache; import com.volmit.iris.scaffold.cache.AtomicCache;
import com.volmit.iris.util.*; import com.volmit.iris.util.*;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
@ -36,6 +37,10 @@ public class IrisJigsawPiece extends IrisRegistrant
@DontObfuscate @DontObfuscate
private ObjectPlaceMode placeMode = ObjectPlaceMode.FAST_MAX_HEIGHT; private ObjectPlaceMode placeMode = ObjectPlaceMode.FAST_MAX_HEIGHT;
@Desc("Configure everything about the object placement. Please don't define this unless you actually need it as using this option will slow down the jigsaw deign stage. Use this where you need it, just avoid using it everywhere to keep things fast.")
@DontObfuscate
private IrisObjectPlacement placementOverrides;
private transient AtomicCache<Integer> max2dDim = new AtomicCache<>(); private transient AtomicCache<Integer> max2dDim = new AtomicCache<>();
private transient AtomicCache<Integer> max3dDim = new AtomicCache<>(); private transient AtomicCache<Integer> max3dDim = new AtomicCache<>();
@ -86,6 +91,12 @@ public class IrisJigsawPiece extends IrisRegistrant
p.setPlaceMode(getPlaceMode()); p.setPlaceMode(getPlaceMode());
p.setConnectors(new KList<>()); p.setConnectors(new KList<>());
if(getPlacementOverrides() != null)
{
// God fucking dammit
p.setPlacementOverrides(new Gson().fromJson(new Gson().toJson(getPlacementOverrides()), IrisObjectPlacement.class));
}
for(IrisJigsawPieceConnector i : getConnectors()) for(IrisJigsawPieceConnector i : getConnectors())
{ {
p.getConnectors().add(i.copy()); p.getConnectors().add(i.copy());

16
src/main/java/com/volmit/iris/scaffold/jigsaw/PlannedStructure.java
View File

@ -64,8 +64,21 @@ public class PlannedStructure {
return after; return after;
} }
public void place(PlannedPiece i, int startHeight, IrisObjectPlacement options, IObjectPlacer placer, EngineParallaxManager e) public void place(PlannedPiece i, int startHeight, IrisObjectPlacement o, IObjectPlacer placer, EngineParallaxManager e)
{ {
IrisObjectPlacement options = o;
if(i.getPiece().getPlacementOverrides() != null)
{
options= i.getPiece().getPlacementOverrides();
options.getRotation().setEnabled(false);
}
else
{
options.setMode(i.getPiece().getPlaceMode());
}
IrisObject v = i.getObject(); IrisObject v = i.getObject();
int sx = (v.getW()/2); int sx = (v.getW()/2);
int sz = (v.getD()/2); int sz = (v.getD()/2);
@ -73,7 +86,6 @@ public class PlannedStructure {
int zz = i.getPosition().getZ() + sz; int zz = i.getPosition().getZ() + sz;
int offset = i.getPosition().getY() - startHeight; int offset = i.getPosition().getY() - startHeight;
int height = placer.getHighest(xx, zz) + offset + (v.getH() / 2); int height = placer.getHighest(xx, zz) + offset + (v.getH() / 2);
options.setMode(i.getPiece().getPlaceMode());
if(options.getMode().equals(ObjectPlaceMode.PAINT) || options.isVacuum()) if(options.getMode().equals(ObjectPlaceMode.PAINT) || options.isVacuum())
{ {