-
Notifications
You must be signed in to change notification settings - Fork 76
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.
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
Fix refraction and material transitions. #1673
Open
ConsueTerra
wants to merge
1
commit into
chunky-dev:master
Choose a base branch
from
ConsueTerra:feature/better-intersection
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -29,5 +29,6 @@ private Air() { | |
solid = false; | ||
opaque = false; | ||
invisible = true; | ||
refractive = true; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
@@ -244,11 +244,26 @@ public int getData() { | |||||||||||||
} | ||||||||||||||
} | ||||||||||||||
|
||||||||||||||
/** The type of Octree, used to adjust intersection code based on contents*/ | ||||||||||||||
public enum OctreeType { | ||||||||||||||
/** | ||||||||||||||
* Contains all world geometry excluding water, water is removed from water logged blocks | ||||||||||||||
* and full water blocks are replaced with air | ||||||||||||||
*/ | ||||||||||||||
WORLD, | ||||||||||||||
/** | ||||||||||||||
* Contains all the water geometry only, other blocks are air | ||||||||||||||
*/ | ||||||||||||||
WATER | ||||||||||||||
} | ||||||||||||||
|
||||||||||||||
/** | ||||||||||||||
* Timestamp of last serialization. | ||||||||||||||
*/ | ||||||||||||||
private long timestamp = 0; | ||||||||||||||
|
||||||||||||||
public OctreeType type; | ||||||||||||||
|
||||||||||||||
private OctreeImplementation implementation; | ||||||||||||||
|
||||||||||||||
/** | ||||||||||||||
|
@@ -257,9 +272,10 @@ public int getData() { | |||||||||||||
* | ||||||||||||||
* @param octreeDepth The number of levels in the Octree. | ||||||||||||||
*/ | ||||||||||||||
public Octree(String impl, int octreeDepth) { | ||||||||||||||
public Octree(String impl, int octreeDepth, OctreeType type) { | ||||||||||||||
Log.infof("Building new octree (%s)", impl); | ||||||||||||||
implementation = getImplementationFactory(impl).create(octreeDepth); | ||||||||||||||
this.type = type; | ||||||||||||||
} | ||||||||||||||
|
||||||||||||||
protected Octree(OctreeImplementation impl) { | ||||||||||||||
|
@@ -484,6 +500,8 @@ public boolean enterBlock(Scene scene, Ray ray, BlockPalette palette) { | |||||||||||||
int depth = implementation.getDepth(); | ||||||||||||||
|
||||||||||||||
double distance = 0; | ||||||||||||||
//tread air as a null block depending on octreetype and were we are in the trace | ||||||||||||||
boolean includeAir = this.type == OctreeType.WORLD && !ray.getPrevMaterial().isWater(); | ||||||||||||||
|
||||||||||||||
// floating point division are slower than multiplication so we cache them | ||||||||||||||
// We also try to limit the number of time the ray origin is updated | ||||||||||||||
|
@@ -539,9 +557,14 @@ public boolean enterBlock(Scene scene, Ray ray, BlockPalette palette) { | |||||||||||||
ray.distance += distance; | ||||||||||||||
distance = 0; | ||||||||||||||
if (currentBlock.intersect(ray, scene)) { | ||||||||||||||
if (prevBlock != currentBlock) | ||||||||||||||
if (prevBlock != currentBlock) { //|| (currentBlock.refractive)) { | ||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ? |
||||||||||||||
//for things like glass panes coerce the current mat to be air or water | ||||||||||||||
// TODO testing | ||||||||||||||
if (currentBlock.refractive) { | ||||||||||||||
//ray.setCurrentMaterial(currentBlock.waterlogged ? Water.INSTANCE : Air.INSTANCE); | ||||||||||||||
} | ||||||||||||||
Comment on lines
+563
to
+565
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Either remove this or comment it alltogether.
Suggested change
|
||||||||||||||
return true; | ||||||||||||||
|
||||||||||||||
} | ||||||||||||||
ray.o.scaleAdd(Ray.OFFSET, ray.d); | ||||||||||||||
offsetX = -ray.o.x * invDx; | ||||||||||||||
offsetY = -ray.o.y * invDy; | ||||||||||||||
|
@@ -556,7 +579,7 @@ public boolean enterBlock(Scene scene, Ray ray, BlockPalette palette) { | |||||||||||||
offsetZ = -ray.o.z * invDz; | ||||||||||||||
continue; | ||||||||||||||
} | ||||||||||||||
} else if (!currentBlock.isSameMaterial(prevBlock) && currentBlock != Air.INSTANCE) { | ||||||||||||||
} else if (!currentBlock.isSameMaterial(prevBlock) && (currentBlock != Air.INSTANCE || includeAir)) { | ||||||||||||||
// Origin and distance of ray need to be updated | ||||||||||||||
ray.o.scaleAdd(distance, ray.d); | ||||||||||||||
ray.distance += distance; | ||||||||||||||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.