提交 · c134418bcb70ceedbb94532b720e09e7e28dd34f · Ablesons / three.js

24 2月, 2016 23 次提交
- B
  
  add encodings to includes for primary frag shaders. · c134418b
  由 Ben Houston 提交于 2月 24, 2016
  
  c134418b
- B
  Merge branch 'dev' of git@github.com:mrdoob/three.js.git into texture_encoding · 91d9af89
  由 Ben Houston 提交于 2月 24, 2016
```
# Conflicts:
#	src/renderers/shaders/ShaderLib.js
```
  91d9af89
- B
  
  remove encoding_template and WebGLShaderPrePRocessor as mrdoob has rewritten it. · 653a2787
  由 Ben Houston 提交于 2月 24, 2016
  
  653a2787
- B
  
  Merge branch 'texture_encoding' of git@github.com:bhouston/three.js.git into texture_encoding · c1aa7693
  由 Ben Houston 提交于 2月 24, 2016
  
  c1aa7693
- B
  start addressing @mrdoob's feedback here:... · 4cc3052d
  由 Ben Houston 提交于 2月 24, 2016
```
start addressing @mrdoob's feedback here: https://github.com/mrdoob/three.js/pull/8117/files#r53900857
```
  4cc3052d
- M
  Merge pull request #8209 from stity/binaryVTKLoader · 5b55178b
  由 Mr.doob 提交于 2月 24, 2016
```
Fix VTK parser pull request 
```
  5b55178b
- M
  
  More tweaks to webgl_effects_cardboard. · 224b6add
  由 Mr.doob 提交于 2月 24, 2016
  
  224b6add
- M
  
  Improved webgl_effects_cardboard example. · 8633fada
  由 Mr.doob 提交于 2月 24, 2016
  
  8633fada
- V
  Merge branch 'dev' of https://github.com/mrdoob/three.js into binaryVTKLoader · 627f7ee4
  由 Valentin Demeusy 提交于 2月 24, 2016
```
Conflicts:
	examples/js/loaders/VTKLoader.js
```
  627f7ee4
- M
  
  Updated builds. · 6c16ca41
  由 Mr.doob 提交于 2月 24, 2016
  
  6c16ca41
- M
  
  WebGLProgram: Added parseIncludes. · ca6128d7
  由 Mr.doob 提交于 2月 24, 2016
  
  ca6128d7
- V
  
  fix : broken parser when type is ASCII · 455508c8
  由 Valentin Demeusy 提交于 2月 24, 2016
  
  455508c8
- M
  
  VTKLoader clean up. · a018dc54
  由 Mr.doob 提交于 2月 24, 2016
  
  a018dc54
- M
  Merge pull request #8208 from stity/binaryVTKLoader · 8e026aa3
  由 Mr.doob 提交于 2月 24, 2016
```
Binary VTK parser and support for triangle strip
```
  8e026aa3
- V
  
  add : vtk binary parser and triangle strip support for both ascii and binary · e7ae748b
  由 Valentin Demeusy 提交于 2月 24, 2016
  
  e7ae748b
- M
  
  Updated builds. · a566a96f
  由 Mr.doob 提交于 2月 24, 2016
  
  a566a96f
- M
  
  BoxBufferGeometry clean up. · 7b2edbc3
  由 Mr.doob 提交于 2月 24, 2016
  
  7b2edbc3
- M
  Merge pull request #8195 from Mugen87/dev · 7c5b995c
  由 Mr.doob 提交于 2月 24, 2016
```
New BoxBufferGeometry
```
  7c5b995c
- M
  Merge pull request #8207 from kintel/stlbinaryexporter · bbacf8bf
  由 Mr.doob 提交于 2月 24, 2016
```
STLBinaryExporter: Properly support BufferGeometry
```
  bbacf8bf
- M
  Bugfix: The binary STL exporter didn't handle meshes imported from binary STL... · f60800eb
  由 Marius Kintel 提交于 2月 23, 2016
```
Bugfix: The binary STL exporter didn't handle meshes imported from binary STL files (BufferGeometry)
```
  f60800eb
- M
  
  Geometry.fromBufferGeometry: Added support for materialIndex · e539bfeb
  由 Mugen87 提交于 2月 23, 2016
  
  e539bfeb
- B
  
  add comment in docs. · f52454cd
  由 Ben Houston 提交于 2月 23, 2016
  
  f52454cd
- B
  
  add better documentation that MAterial.needsUpdate needs to be set if one changes Texture.encoding. · bc0d7143
  由 Ben Houston 提交于 2月 23, 2016
  
  bc0d7143
23 2月, 2016 11 次提交
- M
  Merge pull request #8201 from WestLangley/dev-ninja · cbb1b4a7
  由 Mr.doob 提交于 2月 23, 2016
```
DisplacementMap Example: Add additional params to gui controls
```
  cbb1b4a7
- M
  
  Updated builds. · d5b5ce91
  由 Mr.doob 提交于 2月 23, 2016
  
  d5b5ce91
- M
  
  ColladaLoader2: Clean up. · 1ab117bc
  由 Mr.doob 提交于 2月 23, 2016
  
  1ab117bc
- M
  
  Merge branch 'dev' of https://github.com/mrdoob/three.js into dev · a2ebe814
  由 Mr.doob 提交于 2月 23, 2016
  
  a2ebe814
- M
  Merge pull request #8197 from kampfgnu/dev · 4cef6b01
  由 Mr.doob 提交于 2月 23, 2016
```
extend parsing of effectParameter 'texture' in ColladaLoader2
```
  4cef6b01
- M
  Merge pull request #8202 from WestLangley/dev-shadow · 227d72f2
  由 Mr.doob 提交于 2月 23, 2016
```
ShadowMaterial: bug fix
```
  227d72f2
- W
  
  ShadowMaterial: bug fix · 8063e0e9
  由 WestLangley 提交于 2月 22, 2016
  
  8063e0e9
- W
  
  Add additional params to gui controls · 524f7112
  由 WestLangley 提交于 2月 22, 2016
  
  524f7112
- M
  
  BoxBufferGeometry: Added MultiMaterial support · e22d8ed3
  由 Mugen87 提交于 2月 22, 2016
  
  e22d8ed3
- B
  
  Merge branch 'dev' of git@github.com:mrdoob/three.js into texture_encoding · a1c225ab
  由 Ben Houston 提交于 2月 22, 2016
  
  a1c225ab
- B
  
  cast bvec3 to vec3 so that mix works. · e204686e
  由 Ben Houston 提交于 2月 22, 2016
  
  e204686e
22 2月, 2016 6 次提交
- K
  extend parsing of effectParameter 'texture' in ColladaLoader2 (texture... · 60f8a2f6
  由 kampfgnu 提交于 2月 22, 2016
```
extend parsing of effectParameter 'texture' in ColladaLoader2 (texture parameters like repeatU, repeatV, offsetU, offsetV, wrapS, wrapT),
as maya exports this information into the texture->extra->technique XML node
```
  60f8a2f6
- M
  
  Clean up. · 112e4bc5
  由 Mr.doob 提交于 2月 22, 2016
  
  112e4bc5
- M
  
  webgl_effects_cardboard: added click to fullscreen. · a1b7da9b
  由 Mr.doob 提交于 2月 22, 2016
  
  a1b7da9b
- M
  
  Disable msaa for effects examples. · e8443111
  由 Mr.doob 提交于 2月 22, 2016
  
  e8443111
- M
  
  *Effect: Use renderer.getPixelRatio() · 232a84a2
  由 Mr.doob 提交于 2月 22, 2016
  
  232a84a2
- M
  New BoxBufferGeometry · b5ddc513
  由 Mugen87 提交于 2月 22, 2016
```
BoxGeometry's BufferGeometry port
```
  b5ddc513

Ablesons / three.js 与 Fork 源项目一致

Ablesons / three.js
与 Fork 源项目一致