Skip to content

Commit

Permalink
Merge branch 'Dev'
Browse files Browse the repository at this point in the history
- modified .gitignore for master branch ("non Dev")
  • Loading branch information
sapo17 committed Apr 5, 2023
2 parents dee59d5 + 2968036 commit 3293254
Show file tree
Hide file tree
Showing 91 changed files with 2,515,342 additions and 356 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# 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/*
Expand Down
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"name": "Python: Current File",
"type": "python",
"request": "launch",
"program": "${file}",
"program": "${workspaceFolder}/material_optimizer_gui.py",
"console": "integratedTerminal",
"justMyCode": true
}
Expand Down
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 3293254

Please sign in to comment.