Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Abelnation RectAreaLight with ltc approximation #10041

Merged
merged 77 commits into from
Nov 9, 2016
Merged

Abelnation RectAreaLight with ltc approximation #10041

merged 77 commits into from
Nov 9, 2016

Conversation

sam-g-steel
Copy link
Contributor

@sam-g-steel sam-g-steel commented Nov 6, 2016

Brought the code up to date so it can be merged without conflict.

#9234

aallison and others added 30 commits May 6, 2016 18:07
Fix broken references to THREE namespace in geometries.
…ttps://github.com/abelnation/three.js into abelnation-polygonal-light-shading-linear-transformed-cosines

# Conflicts:
#	src/renderers/WebGLRenderer.js
#	src/renderers/shaders/ShaderLib.js
#	src/renderers/shaders/UniformsLib.js
#	src/renderers/shaders/UniformsUtils.js
#	src/renderers/webgl/WebGLLights.js
#	src/renderers/webgl/WebGLProgram.js
#	utils/build/includes/common.json
#	utils/build/includes/extras.json
#	utils/build/includes/math.json
…ygonal-light-shading-linear-transformed-cosines
Noticed that the code from @abelnation is not his latest...
more merging to come!!!
…ub.com/abelnation/three.js into abelnation-rect-area-light-with-ltc-approximation

# Conflicts:
#	examples/files.js
#	examples/webgl_lights_rectarealight.html
#	src/extras/helpers/RectAreaLightHelper.js
#	src/lights/RectAreaLight.js
#	src/renderers/WebGLRenderer.js
#	src/renderers/shaders/ShaderChunk/bsdfs.glsl
#	src/renderers/shaders/ShaderChunk/common.glsl
#	src/renderers/shaders/ShaderChunk/lights_lambert_vertex.glsl
#	src/renderers/shaders/ShaderChunk/lights_pars.glsl
#	src/renderers/shaders/ShaderChunk/lights_phong_pars_fragment.glsl
#	src/renderers/shaders/ShaderChunk/lights_template.glsl
#	src/renderers/shaders/ShaderChunk/shadowmask_pars_fragment.glsl
#	src/renderers/shaders/ShaderLib.js
#	src/renderers/shaders/UniformsLib.js
#	src/renderers/webgl/WebGLProgram.js
#	src/renderers/webgl/WebGLPrograms.js
#	src/textures/Texture.js
#	test/unit/lights/RectAreaLight.tests.js
#	utils/build/includes/common.json
#	utils/build/includes/extras.json
webgl_lights_arealight improved
RectAreaLightHelper update bugs fixed
mrdoob and others added 21 commits November 6, 2016 15:34
* save typed array info in attribute properties

* use saved attribute properties

* remove unused variable
…odified after initial rendering (#9512)

* add setDiscardBuffer method to BufferGeometry

* added discard support to BufferAttribute

* add mechanism for discard of BufferAttribute TypedArrays

* use more elegant method for creating dummy typed array.

* fix typo

* Update BufferGeometry.js

fix brain fade

* rework to use callbacks (phase 1)

* rework part 2

* remove build file

* support setting onUploadCallback from Geometry

* remove repeated calculation from renderer

* remove now redundant getter

* remove geoemtry interface

* document discard mechanism.

* merge fixes

* restore return.this

* drop unneeded call()

* rename discard() method to disposeArray()
* added missing methods

* Finished add methods

* redid changed to WebGLRenderer.html
* Created documentation for DepthTexture

* pulled upstream

* added missing comma to docs/list.js
…ion-rect-area-light-with-ltc-approximation

# Conflicts:
#	build/three.js
#	build/three.modules.js
@abelnation
Copy link
Contributor

awesome awesome! thanks for putting in the work to get this working with the latest updates!

@mrdoob
Copy link
Owner

mrdoob commented Nov 7, 2016

Would it be possible to not include the builds in the PR?

There is also a ton of things that I would like to remove (mainly the whole examples/polygon_light_example/ folder) but I'm happy to do that myself after merging.

@mrdoob
Copy link
Owner

mrdoob commented Nov 7, 2016

Actually, seems like it has no conflicts, so I'll merge and do the clean up.

@mrdoob mrdoob merged commit 346f38c into mrdoob:dev Nov 9, 2016
@mrdoob
Copy link
Owner

mrdoob commented Nov 9, 2016

Thanks!

@sam-g-steel sam-g-steel deleted the abelnation-rect-area-light-with-ltc-approximation branch November 9, 2016 03:20
@sam-g-steel
Copy link
Contributor Author

Awesome!!!
Glad I could help!
Can't wait for v83

@aardgoose aardgoose mentioned this pull request Nov 9, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.