Skip to content

Commit

Permalink
Merge branch 'alpha'
Browse files Browse the repository at this point in the history
  • Loading branch information
jakedowns committed Jan 17, 2024
2 parents 6963f21 + b12db0a commit 4a2f831
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions public/pixel-mixer.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r128/three.min.js"></script>
<script src="https://jakedowns.github.io/starpages/res/CCapture.all.min.js"></script>
<link href="https://unpkg.com/tailwindcss@^2.0.2/dist/tailwind.min.css" rel="stylesheet">
<script type="module">
import GUI from 'lil-gui';
const panel = new GUI( );

window.panel = panel;
</script>
<script src="https://unpkg.com/[email protected]/dist/lil-gui.umd.js"></script>

<style>
html, body { margin: 0; padding: 0; overflow: hidden; background-color: #000; }
Expand Down Expand Up @@ -1485,6 +1480,11 @@ <h1>Pixel Mixer Demo</h1>
}

window.setupPanel = function () {
if(!window.panel){
window.panel = new lil.GUI();
//console.warn('window.setupPanel, panel not ready yet');
//return;
}
panel.add(settings, 'pixel_density', 0.00001, 32, 0.00001)
.name( 'Pixel Density' )
.onChange( window.resizeCanvas );
Expand Down

0 comments on commit 4a2f831

Please sign in to comment.