Skip to content

Fix inheritance of ambientocclusion property from parent model #729

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TBlueF merged 1 commit into from
Aug 11, 2025
+10 −1
Merged

Fix inheritance of ambientocclusion property from parent model #729

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion core/src/main/java/de/bluecolored/bluemap/core/resources/pack/resourcepack/model/Model.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class Model {
private @Nullable ResourcePath<Model> parent;
private Map<String, TextureVariable> textures = new HashMap<>();
private Element @Nullable [] elements;
private boolean ambientocclusion = true;
@Getter(AccessLevel.NONE) private Boolean ambientocclusion;

private transient boolean culling = false;
private transient boolean occluding = false;
Expand Down Expand Up @@ -101,6 +101,10 @@ public synchronized void applyParent(ResourcePool<Model> modelPool) {
if (parent != null) {
parent.applyParent(modelPool);

if (this.ambientocclusion == null && parent.ambientocclusion != null) {
this.ambientocclusion = parent.ambientocclusion;
}

parent.textures.forEach(this::applyTextureVariable);
if (this.elements == null && parent.elements != null) {
this.elements = new Element[parent.elements.length];
Expand Down Expand Up @@ -150,4 +154,9 @@ public synchronized void calculateProperties(ResourcePool<Texture> texturePool)
}
}

public boolean isAmbientocclusion() {
if (ambientocclusion == null) return true;
return ambientocclusion;
}

}
Loading