Skip to content
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

fix line rendering (#891) #246

Merged
merged 1 commit into from
Mar 30, 2017
Merged

fix line rendering (#891) #246

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
21 changes: 11 additions & 10 deletions src/scene/immediate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ pc.extend(pc.Application.prototype, function () {
var quadMesh = null;
var cubeLocalPos = null;
var cubeWorldPos = null;
var linesGraphNode = new pc.GraphNode();
var tempGraphNode = new pc.GraphNode();
var identityGraphNode = new pc.GraphNode();

var lineBatch = function () {
// Sensible default value; buffers will be doubled and reallocated when it's not enough
Expand Down Expand Up @@ -48,9 +49,9 @@ pc.extend(pc.Application.prototype, function () {
this.vbRam = new DataView(this.vb.lock());

if (!this.meshInstance) {
linesGraphNode.worldTransform = pc.Mat4.IDENTITY;
linesGraphNode.dirtyWorld = linesGraphNode.dirtyNormal = false;
this.meshInstance = new pc.MeshInstance(linesGraphNode, this.mesh, this.material);
identityGraphNode.worldTransform = pc.Mat4.IDENTITY;
identityGraphNode.dirtyWorld = identityGraphNode.dirtyNormal = false;
this.meshInstance = new pc.MeshInstance(identityGraphNode, this.mesh, this.material);
}
}
},
Expand Down Expand Up @@ -261,9 +262,9 @@ pc.extend(pc.Application.prototype, function () {

// Draw mesh at this frame
function renderMesh(mesh, material, matrix) {
linesGraphNode.worldTransform = matrix;
linesGraphNode.dirtyWorld = linesGraphNode.dirtyNormal = false;
var instance = new pc.MeshInstance(linesGraphNode, mesh, material);
tempGraphNode.worldTransform = matrix;
tempGraphNode.dirtyWorld = tempGraphNode.dirtyNormal = false;
var instance = new pc.MeshInstance(tempGraphNode, mesh, material);
this.scene.immediateDrawCalls.push(instance);
}

Expand Down Expand Up @@ -293,9 +294,9 @@ pc.extend(pc.Application.prototype, function () {
quadMesh.primitive[0].indexed = false;
}
// Issue quad drawcall
linesGraphNode.worldTransform = matrix;
linesGraphNode.dirtyWorld = linesGraphNode.dirtyNormal = false;
var quad = new pc.MeshInstance(linesGraphNode, quadMesh, material);
tempGraphNode.worldTransform = matrix;
tempGraphNode.dirtyWorld = tempGraphNode.dirtyNormal = false;
var quad = new pc.MeshInstance(tempGraphNode, quadMesh, material);
if (layer) quad.layer = layer;
this.scene.immediateDrawCalls.push(quad);
}
Expand Down