Skip to content

Commit

Permalink
add github and issues links; unbind some bound textures
Browse files Browse the repository at this point in the history
  • Loading branch information
ixchow committed May 2, 2024
1 parent def4fc0 commit d77284a
Showing 1 changed file with 30 additions and 1 deletion.
31 changes: 30 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
--main-font-color: #C4C0AD;
--far-font-color: #E4E0CD;
--font-color-highlight: #D4D0CD;
--link-color: #D1C6B5;

/* syntax highlighting */
--comment: #74705D;
Expand All @@ -34,6 +35,7 @@
--main-font-color: #222;
--far-font-color: #111;
--font-color-highlight: #222;
--link-color: #181818;

/* syntax highlighting, from solarized https://en.wikipedia.org/wiki/Solarized */
--comment: #839496;
Expand All @@ -52,6 +54,10 @@
color: var(--far-font-color);
}

body a {
color: var(--link-color);
}

#dropTarget {
position:fixed;
left:0;
Expand Down Expand Up @@ -125,6 +131,15 @@
box-shadow: 0 0 1px 0 #0008;
}

.controlsInfo {
display:block;
text-align:right;
flex-grow: 1;
}
.controlsInfo + .controlsInfo {
flex-grow: 0;
}

.controls-section {
margin-left: 1em;
}
Expand Down Expand Up @@ -526,6 +541,8 @@
<button id="save-yarn-path" class="controlsButton">Save Yarn Path</button>
<button id="save-knitout" class="controlsButton">Save Knitout</button>
<!-- <button id="reallocate-spots" class="controlsButton">Reallocate Needle Locations</button> -->
<span class="controlsInfo"><a href="https://github.com/textiles-lab/solid-knitting-ui/">github page</a>;</span>
<span class="controlsInfo"><a href="https://github.com/textiles-lab/solid-knitting-ui/issues">report a bug</a></span>

</div>

Expand Down Expand Up @@ -4305,7 +4322,7 @@ <h2>Block Library:</h2>
]));
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.NEAREST);
gl.texParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.NEAREST);
// gl.bindTexture(gl.TEXTURE_2D, 0);
gl.bindTexture(gl.TEXTURE_2D, null);
}

gl.bindFramebuffer(gl.FRAMEBUFFER, null);
Expand Down Expand Up @@ -4335,6 +4352,18 @@ <h2>Block Library:</h2>
gl.clearColor(0.5,0.5,0.5,1.0);
gl.clear(gl.COLOR_BUFFER_BIT);
fullscreenTriangle.draw(postprocessProgram);

gl.activeTexture(gl.TEXTURE3);
gl.bindTexture(gl.TEXTURE_2D, null);

gl.activeTexture(gl.TEXTURE2);
gl.bindTexture(gl.TEXTURE_2D, null);

gl.activeTexture(gl.TEXTURE1);
gl.bindTexture(gl.TEXTURE_2D, null);

gl.activeTexture(gl.TEXTURE0);
gl.bindTexture(gl.TEXTURE_2D, null);
}
}
const postprocess = new Postprocess();
Expand Down

0 comments on commit d77284a

Please sign in to comment.