Skip to content

Commit 4323c13

Browse files
authored
Merge pull request #520 from ninjadev/dvoje-fixes
Dvoje fixes
2 parents f887993 + ce9ba52 commit 4323c13

File tree

7 files changed

+13219
-10417
lines changed

7 files changed

+13219
-10417
lines changed

nin/backend/watch.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ function watch(projectPath, cb) {
4040
return;
4141
}
4242

43+
if(path.endsWith('~')) {
44+
return;
45+
}
46+
4347
if (logFileChanges) {
4448
console.log(chalk.yellow('Change in project detected: ') +
4549
chalk.cyan(event) +

nin/dasBoot/FullscreenRenderTargetPool.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ class FullscreenRenderTargetPool {
2121
this.renderTargets[this.used] = renderTarget;
2222
}
2323
this.used++;
24+
renderTarget.texture.repeat.set(1, 1);
25+
renderTarget.texture.offset.set(0, 0);
2426
return renderTarget;
2527
}
2628

nin/dasBoot/NodeManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class NodeManager {
5757

5858
resize() {
5959
for(var key in this.nodes) {
60-
this.nodes[key].resize();
60+
this.nodes[key].resize();
6161
}
6262
}
6363

nin/dasBoot/RootNode.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class RootNode extends NIN.Node {
44
inputs: {screen: new NIN.TextureInput()}
55
});
66

7-
this.camera = new THREE.OrthographicCamera(-1, 1, 1, -1, 0, 1);
7+
this.camera = new THREE.OrthographicCamera(-1, 1, 1, -1, 0, 1);
88
this.scene = new THREE.Scene();
99
this.quad = new THREE.Mesh(new THREE.PlaneBufferGeometry(2, 2), null);
1010
this.scene.add(this.quad);
@@ -26,6 +26,8 @@ class RootNode extends NIN.Node {
2626
map: A
2727
});
2828
}
29+
renderer.setRenderTarget(null);
30+
renderer.clear();
2931
renderer.render(this.scene, this.camera);
3032

3133
NIN.FullscreenRenderTargetPool.withdrawFullscreenRenderTargets();

nin/dasBoot/ShaderNode.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@ class ShaderNode extends NIN.Node {
3030

3131
render(renderer) {
3232
const renderTarget = NIN.FullscreenRenderTargetPool.getFullscreenRenderTarget();
33-
renderer.render(this.scene, this.camera, renderTarget, true);
33+
renderer.setRenderTarget(renderTarget);
34+
renderer.clear();
35+
renderer.render(this.scene, this.camera);
36+
renderer.setRenderTarget(null);
3437
this.outputs.render.setValue(renderTarget.texture);
3538
}
3639
}

nin/dasBoot/THREENode.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ class THREENode extends NIN.Node {
3131

3232
render(renderer) {
3333
const renderTarget = NIN.FullscreenRenderTargetPool.getFullscreenRenderTarget();
34-
renderer.render(this.scene, this.camera, renderTarget, true);
34+
renderer.setRenderTarget(renderTarget);
35+
renderer.clear();
36+
renderer.render(this.scene, this.camera);
37+
renderer.setRenderTarget(null);
3538
this.outputs.render.setValue(renderTarget.texture);
3639
}
3740

0 commit comments

Comments
 (0)