 Ricardo Cabello
|
e17620505f
Merge pull request #6269 from fraguada/fraguada-ObjectLoader_AddTextGeometry
|
11 years ago |
 Ben Houston
|
6967b53264
rename oaMapScale -> aoMapIntensity
|
11 years ago |
|
Ben Houston
|
0b993c1b5e
rename lightMapScale > lightMapIntensity
|
11 years ago |
|
Ben Houston
|
54f62cb593
load lightMapScale in ObjectLoader.
|
11 years ago |
|
Ben Houston
|
8f0e72a7c6
safer existence checks in ObjectLoader for map scale factors.
|
11 years ago |
|
Ben Houston
|
c3d026c8ea
aoScale -> aoMapScale.
|
11 years ago |
|
Ben Houston
|
81a7d078f1
Merge branch 'dev' of [email protected]:mrdoob/three.js into ambientOcclusionMap
|
11 years ago |
|
Mr.doob
|
a73523b0cc
Merge pull request #6262 from bhouston/bumpScaleBug
|
11 years ago |
|
Mr.doob
|
7860972a99
ObjectLoader: Clean up.
|
11 years ago |
 Brian Bosak
|
9460d15986
Added shadow support for imported JSON files
|
11 years ago |
|
Ben Houston
|
0dad7ab1cf
ambientOcclusion -> ao per @WestLangley feedback here: https://github.com/mrdoob/three.js/pull/6263#issuecomment-83794671 #2
|
11 years ago |
 Luis E. Fraguada
|
a5ac442b57
Add 'TextGeometry' to Object loader
|
11 years ago |
|
Ben Houston
|
578e995721
fix bug in ObjectLoader. material.bumpScale is a float not a Vector2.
|
11 years ago |
|
Ben Houston
|
0ecfda58f0
add ambientOcclusionScale.
|
11 years ago |
|
Ben Houston
|
b76ad9f285
loading of ambientOcclusionMap.
|
11 years ago |
|
Mr.doob
|
26b71211cc
Merge pull request #6211 from makc/buffer-geometry-loader-fix
|
11 years ago |
 makc
|
498b29f7ee
fixes #6166
|
11 years ago |
|
Mr.doob
|
6db71a67bd
ObjectLoader: Added PlaneBufferGeometry support. Fixes #6203.
|
11 years ago |
 bGute
|
92635c773c
Update ObjectLoader.js
|
11 years ago |
|
Mr.doob
|
a0351d6631
Merge pull request #6106 from rkusa/dataurl
|
11 years ago |
 rkusa
|
ce09b694d8
ObjectLoader: support absolute and data urls
|
11 years ago |
 mese79
|
43c5354f94
add support for normal/bump scale
|
11 years ago |
|
Mr.doob
|
7978aefc14
ObjectLoader: Fixed callback. See c223a4c4bd04cdb7f4fbad339187eea36b4fe857.
|
11 years ago |
|
Mr.doob
|
c223a4c4bd
ObjectLoader: Handle empty json.image case. See b3b9d8bfdf78bbb832db5a50010e82a5ce6f1c43.
|
11 years ago |
|
Mr.doob
|
b3b9d8bfdf
ObjectLoader: Fixed onLoad. See fcf54cd2ed3b9097126c3f6b4fc5764a07f5195e.
|
11 years ago |
|
Mr.doob
|
6f9491163d
ObjectLoader: Fixed empty images. See fcf54cd2ed3b9097126c3f6b4fc5764a07f5195e.
|
11 years ago |
|
Mr.doob
|
57dbbab577
Simplified ObjectLoader.
|
11 years ago |
|
Mr.doob
|
a07886a1e8
Merge branch 'dev' of https://github.com/mrdoob/three.js into dev
|
11 years ago |
|
Mr.doob
|
fcf54cd2ed
ObjectLoader: Fixed editor breakage. Fixes #6091.
|
11 years ago |
|
Luis E. Fraguada
|
e5ae7d153b
Update ObjectLoader.js to load different maps
|
11 years ago |
