Code

[WIP] PBR Materials extension#643

Code

Closed

mlimper wants to merge 44 commits intoKhronosGroup:masterKhronosGroup/glTF:masterfrom tsturm:mastertsturm/glTF:masterCopy head branch name to clipboard

+6,604

Commits

Commits on Jun 17, 2016

• initial commit

  tsturm

  committed
  9df448c

  Copy full SHA for 9df448c

• Update README.md

  Show description for 292748a
  tsturm

  authored
  292748a

  Copy full SHA for 292748a

Commits on Jul 6, 2016

• Create Appendix.md

  

  Max Limper

  authored
  e18e2ce

  Copy full SHA for e18e2ce

• Update Appendix.md

  

  Max Limper

  authored
  7b1a838

  Copy full SHA for 7b1a838

Commits on Jul 7, 2016

• Moved PBR concepts to Appendix.md

  

  msousa

  committed
  158c4d4

  Copy full SHA for 158c4d4

• Added schema

  

  msousa

  committed
  24463da

  Copy full SHA for 24463da

• Updated README

  

  msousa

  committed
  5c152cd

  Copy full SHA for 5c152cd

• Put list of resources to appendix

  

  Max Limper

  committed
  90dd746

  Copy full SHA for 90dd746

• schema updates, renamed specular_glossiness schema file

  

  Max Limper

  committed
  5078f0d

  Copy full SHA for 5078f0d

• cleanups and updates in spec, split variables into factors and textures

  

  Max Limper

  committed
  4a17ab3

  Copy full SHA for 4a17ab3

• replace some images

  tsturm

  committed
  ce5b6df

  Copy full SHA for ce5b6df

• remove duplicated figure labels

  tsturm

  committed
  ee7cf4d

  Copy full SHA for ee7cf4d

• figure size fix

  tsturm

  committed
  d473c7b

  Copy full SHA for d473c7b

• figure reference fix

  tsturm

  committed
  45d559b

  Copy full SHA for 45d559b

• Merge branch 'cleanup'

  Show description for bbaccfd
  tsturm

  committed
  bbaccfd

  Copy full SHA for bbaccfd

Commits on Jul 8, 2016

• Changed prefix to FRAUNHOFER

  

  Max Limper

  committed
  c9ac6cd

  Copy full SHA for c9ac6cd

Commits on Sep 1, 2016

• Incorporated most points from pjcozzis first review

  

  Max Limper

  committed
  c5c2ecf

  Copy full SHA for c5c2ecf

• Fixed link to KHR_materials_common

  

  Max Limper

  authored
  5fa4543

  Copy full SHA for 5fa4543

Commits on Sep 22, 2016

• fix typo in equation 5

  tsturm

  committed
  72120eb

  Copy full SHA for 72120eb

Commits on Sep 29, 2016

• added slightly modified three.js shader example as a basis for the first pbr example

  

  Max Limper

  committed
  1e73aea

  Copy full SHA for 1e73aea

• Merge branch 'master' of https://github.com/tsturm/glTF

  

  Max Limper

  committed
  5f8804e

  Copy full SHA for 5f8804e

Commits on Oct 25, 2016

• [wip] basic PBR app skeleton, using custom shaders and a basic glTF asset with pbr-ready textures

  

  Max Limper

  committed
  8d4c89b

  Copy full SHA for 8d4c89b

Commits on Oct 27, 2016

• Added tangents and binormals in hammer asset, adapted shader to use tangent-space normal mapping

  

  Max Limper

  committed
  7aed2a5

  Copy full SHA for 7aed2a5

Commits on Oct 30, 2016

• Simple untextured roughness/metalness example

  

  Max Limper

  committed
  e0e419a

  Copy full SHA for e0e419a

• Fixed (flipped) metalness axis in example

  

  Max Limper

  committed
  187b7c1

  Copy full SHA for 187b7c1

• Added linear2sRGB conversion

  

  Max Limper

  committed
  e157406

  Copy full SHA for e157406

Commits on Oct 31, 2016

• panorama environment map and basic code to use it (WIP)

  

  Max Limper

  committed
  39a58f9

  Copy full SHA for 39a58f9

Commits on Nov 9, 2016

• Add specular-glossiness workflow

  bghgary

  committed
  9b220cc

  Copy full SHA for 9b220cc

Commits on Nov 10, 2016

• Add gui for updating values on the fly, including workflow, albedo, opacity, and reflectivity

  bghgary

  committed
  9905487

  Copy full SHA for 9905487

Commits on Nov 15, 2016

• Fix a bug with the color lerp and removed some unused code

  bghgary

  committed
  cf131da

  Copy full SHA for cf131da

Commits on Nov 16, 2016

• Merge pull request #2 from bghgary/master

  Show description for 6ca13dd
  

  Max Limper

  authored
  6ca13dd

  Copy full SHA for 6ca13dd

Commits on Nov 17, 2016

• envMap / irrMap added (basically set up, not actively used in shader at the moment)

  

  Max Limper

  committed
  e3b4b37

  Copy full SHA for e3b4b37

Commits on Nov 18, 2016

• [wip] basic environment map sampling

  

  Max Limper

  committed
  9949197

  Copy full SHA for 9949197

Commits on Jan 3, 2017

• Used more easily readable example numbers, added more contributors

  

  Max Limper

  committed
  3770706

  Copy full SHA for 3770706

• added comment about conversion to linear space

  

  Max Limper

  committed
  524cdd0

  Copy full SHA for 524cdd0

• made usage of linear space for computations more explicit

  

  Max Limper

  committed
  d5f4790

  Copy full SHA for d5f4790

• Add space column specifying how the properties should be interpreted.

  bghgary

  committed
  5d91d6d

  Copy full SHA for 5d91d6d

Commits on Jan 4, 2017

• Merge pull request #3 from bghgary/add-space-column

  Show description for 4751935
  

  Max Limper

  authored
  4751935

  Copy full SHA for 4751935

• renamed extension prefix to EXT_ (filename not changed for now)

  

  Max Limper

  committed
  e03182c

  Copy full SHA for e03182c

• contributors update

  

  Max Limper

  committed
  e1a4530

  Copy full SHA for e1a4530

• Merge branch 'master' of https://github.com/tsturm/glTF

  

  Max Limper

  committed
  b9bf255

  Copy full SHA for b9bf255

• Add energy conservation to spec gloss model

  bghgary

  committed
  9e117a2

  Copy full SHA for 9e117a2

• Fixed typo

  bghgary

  committed
  28778ef

  Copy full SHA for 28778ef

Commits on Jan 5, 2017

• Merge pull request #4 from bghgary/add-energy-conservation-to-spec-gloss

  Show description for de6f796
  

  Max Limper

  authored
  de6f796

  Copy full SHA for de6f796