Code

3D Tiles - Ternary Functions#4709

Code

Closed

Dylan-Brown wants to merge 16 commits intoCesiumGS:3d-tilesCesiumGS/cesium:3d-tilesfrom Dylan-Brown:ternary-functionsDylan-Brown/cesium:ternary-functionsCopy head branch name to clipboard

+4,687-8,307

Commits

Commits on Dec 1, 2016

• Merge remote-tracking branch 'upstream/3d-tiles' into ternary-functions

  Dylan-Brown

  committed
  8c5dff0

  Copy full SHA for 8c5dff0

• updated Expression, Expression Node Type to include ternary functions.

  Dylan-Brown

  committed
  7ec9aa7

  Copy full SHA for 7ec9aa7

• removed ternary ops from unary ops array

  Dylan-Brown

  committed
  567d840

  Copy full SHA for 567d840

• grammar error in Math.js, Expression.js supporting ternary functions

  Dylan-Brown

  committed
  3faddd6

  Copy full SHA for 3faddd6

Commits on Dec 2, 2016

• tests for clamp, mix

  Dylan-Brown

  committed
  bffea5d

  Copy full SHA for bffea5d

• tests for clamp, mix removed framestate

  Dylan-Brown

  committed
  6ee74ec

  Copy full SHA for 6ee74ec

Commits on Dec 5, 2016

• updated expected in shader expression for clamp, mix

  Dylan-Brown

  committed
  1ba1225

  Copy full SHA for 1ba1225

• Merge remote-tracking branch 'upstream/3d-tiles' into ternary-functions

  Dylan-Brown

  committed
  0f7f5c3

  Copy full SHA for 0f7f5c3

• parseCall handling

  Dylan-Brown

  committed
  e618d81

  Copy full SHA for e618d81

Commits on Dec 7, 2016

• corrections to some cosmetic comments

  Dylan-Brown

  committed
  273edaf

  Copy full SHA for 273edaf

• merge upstream

  Dylan-Brown

  committed
  8aae757

  Copy full SHA for 8aae757

• functions evaluating

  Dylan-Brown

  committed
  02343dd

  Copy full SHA for 02343dd

Commits on Dec 15, 2016

• Fixed evaluation function

  Dylan-Brown

  committed
  163bedf

  Copy full SHA for 163bedf

• merge conflicts resolved in Expression.js

  Dylan-Brown

  committed
  b431c86

  Copy full SHA for b431c86

• Revert "merge conflicts resolved in Expression.js"

  Show description for 4927aa5
  Dylan-Brown

  committed
  4927aa5

  Copy full SHA for 4927aa5

• Style examples for mix, lerp

  Dylan-Brown

  committed
  1a510cb

  Copy full SHA for 1a510cb