git.lukelau.me Git - opengl.git/commit

author	Luke Lau <luke_lau@icloud.com>
	Tue, 20 Nov 2018 03:33:54 +0000 (03:33 +0000)
committer	Luke Lau <luke_lau@icloud.com>
	Tue, 20 Nov 2018 03:33:54 +0000 (03:33 +0000)
commit	0291188124d08368ce28b308482604218bd75393
tree	8a6cab6bce52397c719d40cce4cd9985bb8dd4f5	tree \| snapshot
parent	d80972d96e5fcd444657f937ab2700039efa83d2	commit \| diff

Add glTF PBR model loading

Roughness and metallic are now one texture
Improve image format()/internalformat()/type()
Add script for converting metallic+roughness textures to
metallicroughness

47 files changed:

image.cpp		diff \| blob \| history
image.hpp		diff \| blob \| history
main.cpp		diff \| blob \| history
material.cpp		diff \| blob \| history
material.hpp		diff \| blob \| history
metallicroughness.py	[new file with mode: 0755]	blob
model.cpp		diff \| blob \| history
models/greasy-pan-2-albedo.png	[new file with mode: 0644]	blob
models/greasy-pan-2-ao.png	[moved from models/rustedIron/rustediron2_ao.png with 100% similarity]	blob \| history
models/greasy-pan-2-metallicroughness.png	[new file with mode: 0644]	blob
models/greasy-pan-2-normal.png	[new file with mode: 0644]	blob
models/materials/darktiles/About these PBR files.txt	[moved from models/darktiles/About these PBR files.txt with 100% similarity]	blob \| history
models/materials/darktiles/darktiles1_AO.png	[moved from models/darktiles/darktiles1_AO.png with 100% similarity]	blob \| history
models/materials/darktiles/darktiles1_basecolor.png	[moved from models/darktiles/darktiles1_basecolor.png with 100% similarity]	blob \| history
models/materials/darktiles/darktiles1_metallic.png	[moved from models/darktiles/darktiles1_metallic.png with 100% similarity]	blob \| history
models/materials/darktiles/darktiles1_normal.png	[moved from models/darktiles/darktiles1_normal.png with 100% similarity]	blob \| history
models/materials/darktiles/darktiles1_roughness.png	[moved from models/darktiles/darktiles1_roughness.png with 100% similarity]	blob \| history
models/materials/greasy-pan-2/About these PBR files.txt	[moved from models/rustedIron/About these PBR files.txt with 100% similarity]	blob \| history
models/materials/greasy-pan-2/greasy-pan-2-albedo.png	[new file with mode: 0755]	blob
models/materials/greasy-pan-2/greasy-pan-2-ao.png	[moved from models/streakedmetal/streakedmetal_ao.png with 100% similarity]	blob \| history
models/materials/greasy-pan-2/greasy-pan-2-metal.png	[new file with mode: 0644]	blob
models/materials/greasy-pan-2/greasy-pan-2-metal.psd	[new file with mode: 0755]	blob
models/materials/greasy-pan-2/greasy-pan-2-metallicroughness.png	[new file with mode: 0644]	blob
models/materials/greasy-pan-2/greasy-pan-2-normal.png	[new file with mode: 0755]	blob
models/materials/greasy-pan-2/greasy-pan-2-roughness.png	[moved from models/streakedmetal/streakedmetal_roughness.png with 100% similarity]	blob \| history
models/materials/rustedIron/About these PBR files.txt	[moved from models/streakedmetal/About these PBR files.txt with 100% similarity]	blob \| history
models/materials/rustedIron/rustediron2_ao.png	[new file with mode: 0644]	blob
models/materials/rustedIron/rustediron2_basecolor.png	[moved from models/rustedIron/rustediron2_basecolor.png with 100% similarity]	blob \| history
models/materials/rustedIron/rustediron2_metallic.png	[moved from models/rustedIron/rustediron2_metallic.png with 100% similarity]	blob \| history
models/materials/rustedIron/rustediron2_normal.png	[moved from models/rustedIron/rustediron2_normal.png with 100% similarity]	blob \| history
models/materials/rustedIron/rustediron2_roughness.png	[moved from models/rustedIron/rustediron2_roughness.png with 100% similarity]	blob \| history
models/materials/streakedmetal/About these PBR files.txt	[new file with mode: 0755]	blob
models/materials/streakedmetal/streakedmetal-albedo.png	[moved from models/streakedmetal/streakedmetal_albedo.png with 100% similarity]	blob \| history
models/materials/streakedmetal/streakedmetal-ao.png	[new file with mode: 0644]	blob
models/materials/streakedmetal/streakedmetal-metallicroughness.png	[new file with mode: 0644]	blob
models/materials/streakedmetal/streakedmetal-metalness.png	[moved from models/streakedmetal/streakedmetal_metalness.png with 100% similarity]	blob \| history
models/materials/streakedmetal/streakedmetal-normal.png	[moved from models/streakedmetal/streakedmetal_normal.png with 100% similarity]	blob \| history
models/materials/streakedmetal/streakedmetal-roughness.png	[new file with mode: 0755]	blob
models/metalSphere.dae	[new file with mode: 0644]	blob
models/sphereMetal.bin	[new file with mode: 0644]	blob
models/sphereMetal.blend	[new file with mode: 0644]	blob
models/sphereMetal.gltf	[new file with mode: 0644]	blob
models/streakedmetal-albedo.png	[new file with mode: 0644]	blob
models/streakedmetal-ao.png	[new file with mode: 0644]	blob
models/streakedmetal-metallicroughness.png	[new file with mode: 0644]	blob
models/streakedmetal-normal.png	[new file with mode: 0644]	blob
pbrfrag.glsl		diff \| blob \| history

OpenGL experiments

RSS Atom