Skip to content

Xiaomao Ding : project 6 #4

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

Open
xnieamo wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Xiaomao Ding : project 6 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cdb495
first couple parts done, working on polygonizing
xnieamo Feb 28, 2017
4ce6801
added polygonization and lambert shader
xnieamo Mar 1, 2017
795856b
build
xnieamo Mar 1, 2017
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
48,937 changes: 48,937 additions & 0 deletions build/bundle.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions build/bundle.js.map
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 19 additions & 0 deletions build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<!DOCTYPE html>
<html>
<head>
<title>Project 6: Implicit Surfaces</title>
<style>
html, body {
margin: 0;
overflow: hidden;
}
canvas {
width: 100%;
height: 100%;
}
</style>
</head>
<body>
<script src="bundle.js"></script>
</body>
</html>
29 changes: 21 additions & 8 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ import Framework from './framework'
import LUT from './marching_cube_LUT.js'
import MarchingCubes from './marching_cubes.js'

const DEFAULT_VISUAL_DEBUG = true;
const DEFAULT_ISO_LEVEL = 1.0;
const DEFAULT_GRID_RES = 4;
const DEFAULT_GRID_WIDTH = 10;
const DEFAULT_NUM_METABALLS = 10;
const DEFAULT_VISUAL_DEBUG = false;
const DEFAULT_ISO_LEVEL = 1.2;
const DEFAULT_GRID_RES = 15;
const DEFAULT_GRID_WIDTH = 20;
const DEFAULT_NUM_METABALLS = 5;
const DEFAULT_MIN_RADIUS = 0.5;
const DEFAULT_MAX_RADIUS = 1;
const DEFAULT_MAX_SPEED = 0.01;
const DEFAULT_MAX_RADIUS = 1.0;
const DEFAULT_MAX_SPEED = 0.5;

var App = {
//
Expand Down Expand Up @@ -51,7 +51,13 @@ var App = {
maxRadius: DEFAULT_MAX_RADIUS,

// Maximum speed of a metaball
maxSpeed: DEFAULT_MAX_SPEED
maxSpeed: DEFAULT_MAX_SPEED,

// Color of material
color: "#ffffff",

// Color of ambient light
ambient: "#ffffff"
},

// Scene's framework objects
Expand Down Expand Up @@ -129,6 +135,13 @@ function setupGUI(gui) {
App.marchingCubes.init(App);
});

gui.addColor(App.config, 'color').onChange(function(value){
App.marchingCubes.updateColor(value);
});

gui.addColor(App.config, 'ambient').onChange(function(value){
App.marchingCubes.updateAmbient(value);
});
// --- DEBUG ---

var debugFolder = gui.addFolder('Debug');
Expand Down
Loading