Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
606bbfc
partial progress
sona1111 Nov 8, 2022
3f48525
update readme
BigFranklin1 Nov 9, 2022
56f5137
update design doc
BigFranklin1 Nov 10, 2022
5125499
fixed format
BigFranklin1 Nov 10, 2022
d5b726b
Update README.md
BigFranklin1 Nov 10, 2022
1cd1285
Update README.md
sona1111 Nov 10, 2022
7ba5cb7
Update diagram.png
BigFranklin1 Nov 10, 2022
83d9fbe
Merge branch 'main' of https://github.com/BigFranklin1/cis566-final-p…
BigFranklin1 Nov 10, 2022
aa3e1a9
Update diagram.png
BigFranklin1 Nov 10, 2022
8499b4a
Update diagram.png
BigFranklin1 Nov 10, 2022
4c0b353
-reverted to project 1
sona1111 Nov 13, 2022
a3f7825
-added much of Franklin's base code + square pyramid
sona1111 Nov 13, 2022
0f5e649
-removed unneeded vertices from pyramid
sona1111 Nov 13, 2022
c329f45
-example of drawing extruded face manually
pjewell-biociphers Nov 15, 2022
cf0ca34
-added SDF based implementation after getting frusterated with VBO-ba…
pjewell-biociphers Nov 16, 2022
7c1a111
cleaning up SDFs, fixing bugs.
sona1111 Nov 16, 2022
dcb064d
update readme for milestone 1
BigFranklin1 Nov 17, 2022
325b5c9
update for milestone 1, tweaked the transform of extruded pyramid for…
BigFranklin1 Nov 17, 2022
217c505
-implemented single-face demo of triangulation greebles using SDF method
pjewell-biociphers Nov 17, 2022
0ee8502
Merge remote-tracking branch 'origin/main' into main
pjewell-biociphers Nov 17, 2022
608d736
Update img1.png
BigFranklin1 Nov 17, 2022
1bc6865
-added test script to create SDF (fields, not functions) from meshes,…
sona1111 Nov 20, 2022
82115da
-added example 3d json array read with dims
pjewell-biociphers Nov 22, 2022
355fe76
updated readme for milestone2
BigFranklin1 Nov 28, 2022
edb2bb5
basic gui
BigFranklin1 Nov 28, 2022
34e1984
-scale up pyramid, add option for scale to transform, increment row c…
pjewell-biociphers Nov 28, 2022
675f94d
Merge remote-tracking branch 'origin/main' into main
pjewell-biociphers Nov 28, 2022
1e9731d
-moved main scaling args outside of pyramid object function
pjewell-biociphers Nov 29, 2022
9d0b76a
-added example of inward-facing greebles with subtraction
pjewell-biociphers Nov 29, 2022
dfbeead
-added example of blending a symbol into the pyramid. (poor random fu…
pjewell-biociphers Nov 29, 2022
7569016
-added a 'floor'
pjewell-biociphers Nov 29, 2022
c115d0a
improved directional lighting and the sun for critique
BigFranklin1 Nov 30, 2022
d819aa1
update high dimen imag
BigFranklin1 Nov 30, 2022
c599707
-created and then disabled a SDField renderer. Because of limited uni…
pjewell-biociphers Dec 4, 2022
0df4a87
Merge remote-tracking branch 'origin/main' into main
pjewell-biociphers Dec 4, 2022
6d57d05
-added basic sphere culling
pjewell-biociphers Dec 4, 2022
f2f51e3
-a few different random symbols added
pjewell-biociphers Dec 4, 2022
abef570
added a camera animation and improved gui options
BigFranklin1 Dec 4, 2022
49832a6
Merge branch 'main' of https://github.com/BigFranklin1/cis566-final-p…
BigFranklin1 Dec 4, 2022
7e9aeac
-improved the symbol rendering somewhat
pjewell-biociphers Dec 4, 2022
29dcf79
-improved the symbol rendering somewhat
pjewell-biociphers Dec 4, 2022
72d320e
-more efficient normal estimation
pjewell-biociphers Dec 4, 2022
1164072
-re-added tarus
pjewell-biociphers Dec 4, 2022
7dce828
-added more options
pjewell-biociphers Dec 4, 2022
42a6bc4
-added number symbol modifier
pjewell-biociphers Dec 4, 2022
80048d6
-did legwork for adding in variable time aspects to animate.
pjewell-biociphers Dec 4, 2022
a748177
-reverted numsymbols per tri
pjewell-biociphers Dec 4, 2022
0c91d97
-reverted numsymbols per tri
pjewell-biociphers Dec 4, 2022
de02643
-concept for extra spikes
pjewell-biociphers Dec 4, 2022
c54f419
changed the title :+1: D
BigFranklin1 Dec 5, 2022
c4ab3d4
update readme for the final results
BigFranklin1 Dec 6, 2022
0644924
-updated readme
sona1111 Dec 6, 2022
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
64 changes: 64 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env

# next.js build output
.next

dist/bundle.js
dist/bundle.js.map
Binary file added 1.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added 2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added 3.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
240 changes: 142 additions & 98 deletions README.md

Large diffs are not rendered by default.

Binary file added diagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
20 changes: 20 additions & 0 deletions dist/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<!doctype html>
<html>
<head>
<title>Greeble Generator | CIS 566</title>
<style>
html, body {
margin: 0;
overflow: hidden;
}
#canvas {
width: 100%;
height: 100%;
}
</style>
</head>
<body>
<canvas id="canvas"></canvas>
<script type="text/javascript" src="bundle.js"></script>
</body>
</html>
20 changes: 20 additions & 0 deletions gen_fields_from_mesh.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
from mesh_to_sdf import mesh_to_voxels

import trimesh
import skimage

mesh = trimesh.load('pyramid.obj')

voxels = mesh_to_voxels(mesh, 8, pad=True)

import json

sdfs = {'pyramid': voxels.tolist()}

with open('src/rendering/gl/sdfs.json', 'w') as f:
json.dump(sdfs, f)


# vertices, faces, normals, _ = skimage.measure.marching_cubes(voxels, level=0)
# mesh = trimesh.Trimesh(vertices=vertices, faces=faces, vertex_normals=normals)
# mesh.show()
Binary file added greeble_tutorial.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/blender_symbols.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/blooper1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/clip1.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/clip2.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/clip3.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/final-ui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/final1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/img1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/img2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/img3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/img_high_dimen.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/lowres.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/symbol1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/symbol2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/symbol3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/symbol4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/wiki_symbols.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading