Code

Shader Material Support Improvements#528

Code

Open

BrettASwift wants to merge 10 commits intodevelopmentvirtual-world-framework/vwf:developmentfrom branch/shader-material-updatesvirtual-world-framework/vwf:branch/shader-material-updatesCopy head branch name to clipboard

+185-16

Commits

Commits on Dec 15, 2015

• Add lights property to shader material

  

  Brett Swift

  committed
  51404a5

• Allow properties to be stored on material for use in updateFunction

  

  Brett Swift

  committed
  eb1902f

• Store custom properties on material object

  

  Brett Swift

  committed
  5bf2e9a

• Fix uniform generation with shader material components

  

  Brett Swift

  committed
  4e4d4bd

• Texture arrays and texture wrapping to shader materials

  

  Brett Swift

  committed
  efebe08

• Added ability to set defines in shaders

  

  Brett Swift

  committed
  ddbdda4

• Update shader material when defines are modified

  

  Brett Swift

  committed
  998adea

• Add ability to use a 2d canvas as a texture in shader materials

  

  Brett Swift

  committed
  8dce1f3

• Add fog define toggle for shader materials

  

  Brett Swift

  committed
  abaa783

• Reset internal array when uniform length changes

  

  Brett Swift

  committed
  6186cfb