Allow directional lights to automatically follow shadows #5025
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <title>Hello, World! • A-Frame</title> | ||
| <meta name="description" content="Hello, World! • A-Frame"> | ||
|
|
||
| <script src="../../../dist/aframe-master.js"></script> | ||
| <script> | ||
| AFRAME.registerComponent('follow-shadow', { | ||
| schema: {type: 'selector'}, | ||
| init() {this.el.object3D.renderOrder = -1;}, | ||
| tick() { | ||
| if (this.data) { | ||
| this.el.object3D.position.copy(this.data.object3D.position); | ||
| this.el.object3D.position.y-=0.001; // stop z-fighting | ||
| } | ||
| } | ||
| }); | ||
| </script> | ||
| </head> | ||
| <body> | ||
| <a-scene | ||
| reflection="directionalLight:a-light[type=directional]" | ||
| ar-hit-test="target:#objects;" | ||
| renderer="physicallyCorrectLights:true;colorManagement:true;exposure:1;toneMapping:ACESFilmic;" | ||
| shadow="type:pcfsoft" | ||
| > | ||
| <a-light type="directional" light="castShadow:true;" position="1 1 1" intensity="0.5" shadow-camera-automatic="#objects"></a-light> | ||
| <a-camera position="0 0.4 0" wasd-controls="acceleration:10;"></a-camera> | ||
| <a-entity id="objects" scale="0.2 0.2 0.2" position="0 0 -1" shadow> | ||
| <a-box position="-1 0.5 1" rotation="0 45 0" color="#4CC3D9"></a-box> | ||
| <a-sphere position="0 1.25 -1" radius="1.25" color="#EF2D5E"></a-sphere> | ||
| <a-cylinder position="1 0.75 1" radius="0.5" height="1.5" color="#FFC65D"></a-cylinder> | ||
| </a-entity> | ||
| <a-plane follow-shadow="#objects" material="shader:shadow" shadow="cast:false;" rotation="-90 0 0" width="2" height="2"></a-plane> | ||
| <a-sky color="#ECECEC" hide-on-enter-ar></a-sky> | ||
| </a-scene> | ||
| </body> | ||
| </html> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,6 +11,23 @@ var CubeLoader = new THREE.CubeTextureLoader(); | |
|
|
||
| var probeCache = {}; | ||
|
|
||
| function distanceOfPointFromPlane (positionOnPlane, planeNormal, p1) { | ||
|
There was a problem hiding this comment. Maybe factor out into utils/math.js to keep this tidier. |
||
| // the d value in the plane equation a*x + b*y + c*z=d | ||
| var d = planeNormal.dot(positionOnPlane); | ||
|
|
||
| // distance of point from plane | ||
| return (d - planeNormal.dot(p1)) / planeNormal.length(); | ||
| } | ||
|
|
||
| function nearestPointInPlane (positionOnPlane, planeNormal, p1, out) { | ||
| var t = distanceOfPointFromPlane(positionOnPlane, planeNormal, p1); | ||
| // closest point on the plane | ||
| out.copy(planeNormal); | ||
| out.multiplyScalar(t); | ||
| out.add(p1); | ||
| return out; | ||
| } | ||
|
|
||
| /** | ||
| * Light component. | ||
| */ | ||
|
|
@@ -42,6 +59,7 @@ module.exports.Component = registerComponent('light', { | |
| shadowCameraBottom: {default: -5, if: {castShadow: true}}, | ||
| shadowCameraLeft: {default: -5, if: {castShadow: true}}, | ||
| shadowCameraVisible: {default: false, if: {castShadow: true}}, | ||
| shadowCameraAutomatic: {default: '', if: {type: ['directional']}}, | ||
| shadowMapHeight: {default: 512, if: {castShadow: true}}, | ||
| shadowMapWidth: {default: 512, if: {castShadow: true}}, | ||
| shadowRadius: {default: 1, if: {castShadow: true}} | ||
|
|
@@ -111,7 +129,7 @@ module.exports.Component = registerComponent('light', { | |
| } | ||
|
|
||
| case 'envMap': | ||
| self.updateProbeMap(data, light); | ||
| break; | ||
|
|
||
| case 'castShadow': | ||
|
|
@@ -133,6 +151,14 @@ module.exports.Component = registerComponent('light', { | |
| } | ||
| break; | ||
|
|
||
| case 'shadowCameraAutomatic': | ||
| if (data.shadowCameraAutomatic) { | ||
| self.shadowCameraAutomaticEls = Array.from(document.querySelectorAll(data.shadowCameraAutomatic)); | ||
| } else { | ||
| self.shadowCameraAutomaticEls = []; | ||
| } | ||
| break; | ||
|
|
||
| default: { | ||
| light[key] = value; | ||
| } | ||
|
|
@@ -146,6 +172,50 @@ module.exports.Component = registerComponent('light', { | |
| this.updateShadow(); | ||
| }, | ||
|
|
||
| tick: (function tickSetup () { | ||
|
|
||
| var bbox = new THREE.Box3(); | ||
| var normal = new THREE.Vector3(); | ||
| var cameraWorldPosition = new THREE.Vector3(); | ||
| var tempMat = new THREE.Matrix4(); | ||
| var sphere = new THREE.Sphere(); | ||
| var tempVector = new THREE.Vector3(); | ||
|
|
||
| return function tick () { | ||
|
|
||
| if ( | ||
|
There was a problem hiding this comment. anyway to simplify this condition and do an early return for readability?
|
||
| this.data.type === 'directional' && | ||
| this.light.shadow && | ||
| this.light.shadow.camera instanceof THREE.OrthographicCamera && | ||
| this.shadowCameraAutomaticEls.length | ||
| ) { | ||
| var camera = this.light.shadow.camera; | ||
| camera.getWorldDirection(normal); | ||
| camera.getWorldPosition(cameraWorldPosition); | ||
| tempMat.copy(camera.matrixWorld); | ||
| tempMat.invert(); | ||
|
|
||
| camera.near = 1; | ||
| camera.left = 100000; | ||
| camera.right = -100000; | ||
| camera.top = -100000; | ||
| camera.bottom = 100000; | ||
| this.shadowCameraAutomaticEls.forEach(function (el) { | ||
| bbox.setFromObject(el.object3D); | ||
| bbox.getBoundingSphere(sphere); | ||
| var distanceToPlane = distanceOfPointFromPlane(cameraWorldPosition, normal, sphere.center); | ||
| var pointOnCameraPlane = nearestPointInPlane(cameraWorldPosition, normal, sphere.center, tempVector); | ||
|
|
||
| var pointInXYPlane = pointOnCameraPlane.applyMatrix4(tempMat); | ||
| camera.near = Math.min(-distanceToPlane - sphere.radius - 1, camera.near); | ||
| camera.left = Math.min(-sphere.radius + pointInXYPlane.x, camera.left); | ||
| camera.right = Math.max(sphere.radius + pointInXYPlane.x, camera.right); | ||
| camera.top = Math.max(sphere.radius + pointInXYPlane.y, camera.top); | ||
| camera.bottom = Math.min(-sphere.radius + pointInXYPlane.y, camera.bottom); | ||
| }); | ||
| camera.updateProjectionMatrix(); | ||
| } | ||
| }; | ||
| }()), | ||
|
|
||
| setLight: function (data) { | ||
| var el = this.el; | ||
| var newLight = this.getLight(data); | ||
|
|
@@ -168,6 +238,12 @@ module.exports.Component = registerComponent('light', { | |
| el.setObject3D('light-target', this.defaultTarget); | ||
| el.getObject3D('light-target').position.set(0, 0, -1); | ||
| } | ||
|
|
||
| if (data.shadowCameraAutomatic) { | ||
| this.shadowCameraAutomaticEls = Array.from(document.querySelectorAll(data.shadowCameraAutomatic)); | ||
| } else { | ||
| this.shadowCameraAutomaticEls = []; | ||
| } | ||
| } | ||
| }, | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello, AR World!perhaps to differentiate