Skip to content

Commit

Permalink
Merge branch 'volume-shape-optimization' into Dev
Browse files Browse the repository at this point in the history
  • Loading branch information
sapo17 committed Apr 5, 2023
2 parents da9b056 + ad4295d commit 2968036
Show file tree
Hide file tree
Showing 85 changed files with 2,515,080 additions and 147 deletions.
14 changes: 12 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
# what to not commit: e.g. venv, output directory, pycache. Modify as you like.
mat-opt-venv
output
output/*
!output/README.md
__pycache__
material-optimizer.log
scenes/metashape/*
!scenes/metashape/mini-birdy-statue
!scenes/metashape/mini-birdy-statue

# additional projects do not commit
mitsuba-data
project-independent/**
test.ipynb
*.zip
todo.md
__init__.py
*.psd
105,411 changes: 105,411 additions & 0 deletions blender/meshes/bunny.ply

Large diffs are not rendered by default.

30 changes: 30 additions & 0 deletions blender/meshes/cube.mtl
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Blender MTL File: 'multi-cam-object-extended.blend'
# Material Count: 3

newmtl None
Ns 500
Ka 0.8 0.8 0.8
Kd 0.8 0.8 0.8
Ks 0.8 0.8 0.8
d 1
illum 2

newmtl ObjectBsdf
Ns 250.000000
Ka 1.000000 1.000000 1.000000
Kd 0.390989 0.465569 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.400000
d 1.000000
illum 2

newmtl PlaneBsdf
Ns 359.999993
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
Loading

0 comments on commit 2968036

Please sign in to comment.