sbrl-github/Nibriboard
1
0
Fork 0
mirror of https://github.com/sbrl/Nibriboard.git synced 2018-01-10 21:33:49 +00:00
Code Activity

[client] Fix depth-sorting issue with lines passing through multiple chunks. Fixes #2.

Browse source
This commit is contained in:
Starbeamrainbowlabs 2017-12-26 12:14:48 +00:00
parent 95cbef0689
commit 552fd4c0e7
Signed by: sbrl
GPG key ID: 1BE5172E637709C2
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Nibriboard/ClientFiles/Chunk.js
View file

@ -121,7 +121,7 @@ class Chunk
* @param {ChunkCache} chunkCache The chunk cache to use to fetch data from surrounding chunks. * @param {ChunkCache} chunkCache The chunk cache to use to fetch data from surrounding chunks.
* @param {Rectangle} chunkArea The area in which chunks are being rendered. * @param {Rectangle} chunkArea The area in which chunks are being rendered.
*/ */
render(canvas, context, chunkCache, chunkArea) render(canvas, context, chunkCache, chunkArea, mode)
{ {
var planeSpaceRef = this.chunkRef.inPlaneSpace(this.size); var planeSpaceRef = this.chunkRef.inPlaneSpace(this.size);
@ -131,20 +131,41 @@ class Chunk
for(let line of this.lines) for(let line of this.lines)
{ {
// Don't draw lines that are walked by other chunks // Don't draw lines that are walked by other chunks
if(line.ContinuesFrom != null && /**if(line.ContinuesFrom != null &&
!(chunkCache.fetchChunk(line.ContinuesFrom) instanceof Chunk)) !(chunkCache.fetchChunk(line.ContinuesFrom) instanceof Chunk))
continue; continue;*/
let linePoints = line.Points; let linePoints = line.Points;
// If this line continues from a previous chunk, fetch the last
// point of that line to stitch it up properly
if(line.ContinuesFrom != null &&
chunkCache.fetchChunk(line.ContinuesFrom) instanceof Chunk) {
let prevChunk = chunkCache.fetchChunk(line.ContinuesFrom);
let prevLine = prevChunk.getLineByUniqueId(line.ContinuesFromId);
linePoints.unshift(prevLine.Points[prevLine.Points.length - 1]);
}
// If this line continues into another chunk, fetch the first point
// of that line to stitch it up properly
if(line.ContinuesIn != null &&
chunkCache.fetchChunk(line.ContinuesIn) instanceof Chunk) {
let nextChunk = chunkCache.fetchChunk(line.ContinuesIn);
let nextLine = nextChunk.getLineByUniqueId(line.ContinuesWithId);
if(nextLine != null)
linePoints.push(nextLine.Points[0]);
else
console.warn("Next line was null when we tried to fetch the first point of the following line!");
}
// Fetch all the points on fragments of this line forwards from here // Fetch all the points on fragments of this line forwards from here
if(line.ContinuesIn != null) { /*if(line.ContinuesIn != null) {
let nextLines = chunkCache.fetchLineFragments(line.ContainingChunk, line.UniqueId); let nextLines = chunkCache.fetchLineFragments(line.ContainingChunk, line.UniqueId);
linePoints = []; linePoints = [];
for (let nextLine of nextLines) { for (let nextLine of nextLines) {
linePoints = linePoints.concat(nextLine.Points); linePoints = linePoints.concat(nextLine.Points);
} }
} }*/
context.beginPath(); context.beginPath();
context.moveTo( context.moveTo(