Merge pull request #520 from ninjadev/dvoje-fixes

Dvoje fixes
ninjadev · Jul 10, 2019 · 4323c13 · 4323c13
2 parents f887993 + ce9ba52
commit 4323c13
Show file tree

Hide file tree

Showing 7 changed files with 13,219 additions and 10,417 deletions.
diff --git a/nin/backend/watch.js b/nin/backend/watch.js
@@ -40,6 +40,10 @@ function watch(projectPath, cb) {
       return;
     }
 
+    if(path.endsWith('~')) {
+      return;
+    }
+
     if (logFileChanges) {
       console.log(chalk.yellow('Change in project detected: ') +
                   chalk.cyan(event) +

diff --git a/nin/dasBoot/FullscreenRenderTargetPool.js b/nin/dasBoot/FullscreenRenderTargetPool.js
@@ -21,6 +21,8 @@ class FullscreenRenderTargetPool {
       this.renderTargets[this.used] = renderTarget;
     }
     this.used++;
+    renderTarget.texture.repeat.set(1, 1);
+    renderTarget.texture.offset.set(0, 0);
     return renderTarget;
   }
 

diff --git a/nin/dasBoot/NodeManager.js b/nin/dasBoot/NodeManager.js
@@ -57,7 +57,7 @@ class NodeManager {
 
   resize() {
     for(var key in this.nodes) {
-      this.nodes[key].resize(); 
+      this.nodes[key].resize();
     }
   }
 

diff --git a/nin/dasBoot/RootNode.js b/nin/dasBoot/RootNode.js
@@ -4,7 +4,7 @@ class RootNode extends NIN.Node {
       inputs: {screen: new NIN.TextureInput()}
     });
 
-    this.camera = new THREE.OrthographicCamera(-1, 1, 1, -1, 0, 1); 
+    this.camera = new THREE.OrthographicCamera(-1, 1, 1, -1, 0, 1);
     this.scene = new THREE.Scene();
     this.quad = new THREE.Mesh(new THREE.PlaneBufferGeometry(2, 2), null);
     this.scene.add(this.quad);
@@ -26,6 +26,8 @@ class RootNode extends NIN.Node {
         map: A
       });
     }
+    renderer.setRenderTarget(null);
+    renderer.clear();
     renderer.render(this.scene, this.camera);
 
     NIN.FullscreenRenderTargetPool.withdrawFullscreenRenderTargets();

diff --git a/nin/dasBoot/ShaderNode.js b/nin/dasBoot/ShaderNode.js
@@ -30,7 +30,10 @@ class ShaderNode extends NIN.Node {
 
   render(renderer) {
     const renderTarget = NIN.FullscreenRenderTargetPool.getFullscreenRenderTarget();
-    renderer.render(this.scene, this.camera, renderTarget, true);
+    renderer.setRenderTarget(renderTarget);
+    renderer.clear();
+    renderer.render(this.scene, this.camera);
+    renderer.setRenderTarget(null);
     this.outputs.render.setValue(renderTarget.texture);
   }
 }

diff --git a/nin/dasBoot/THREENode.js b/nin/dasBoot/THREENode.js
@@ -31,7 +31,10 @@ class THREENode extends NIN.Node {
 
   render(renderer) {
     const renderTarget = NIN.FullscreenRenderTargetPool.getFullscreenRenderTarget();
-    renderer.render(this.scene, this.camera, renderTarget, true);
+    renderer.setRenderTarget(renderTarget);
+    renderer.clear();
+    renderer.render(this.scene, this.camera);
+    renderer.setRenderTarget(null);
     this.outputs.render.setValue(renderTarget.texture);
   }