|
@@ -14153,15 +14153,15 @@ Object.assign( Triangle.prototype, {
|
|
|
|
|
|
},
|
|
|
|
|
|
- containsPoint: function ( point ) {
|
|
|
+ getUV: function ( point, uv1, uv2, uv3, target ) {
|
|
|
|
|
|
- return Triangle.containsPoint( point, this.a, this.b, this.c );
|
|
|
+ return Triangle.getUV( point, this.a, this.b, this.c, uv1, uv2, uv3, target );
|
|
|
|
|
|
},
|
|
|
|
|
|
- getUV: function ( point, uv1, uv2, uv3, result ) {
|
|
|
+ containsPoint: function ( point ) {
|
|
|
|
|
|
- return Triangle.getUV( point, this.a, this.b, this.c, uv1, uv2, uv3, result );
|
|
|
+ return Triangle.containsPoint( point, this.a, this.b, this.c );
|
|
|
|
|
|
},
|
|
|
|
|
@@ -18938,6 +18938,8 @@ function WebGLShadowMap( _renderer, _objects, maxTextureSize ) {
|
|
|
if ( lights.length === 0 ) return;
|
|
|
|
|
|
var currentRenderTarget = _renderer.getRenderTarget();
|
|
|
+ var activeCubeFace = _renderer.getActiveCubeFace();
|
|
|
+ var activeMipMapLevel = _renderer.getActiveMipMapLevel();
|
|
|
|
|
|
var _state = _renderer.state;
|
|
|
|
|
@@ -19095,7 +19097,7 @@ function WebGLShadowMap( _renderer, _objects, maxTextureSize ) {
|
|
|
|
|
|
scope.needsUpdate = false;
|
|
|
|
|
|
- _renderer.setRenderTarget( currentRenderTarget );
|
|
|
+ _renderer.setRenderTarget( currentRenderTarget, activeCubeFace, activeMipMapLevel );
|
|
|
|
|
|
};
|
|
|
|
|
@@ -22780,6 +22782,8 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
_framebuffer = null,
|
|
|
|
|
|
+ _currentActiveCubeFace = 0,
|
|
|
+ _currentActiveMipmapLevel = 0,
|
|
|
_currentRenderTarget = null,
|
|
|
_currentFramebuffer = null,
|
|
|
_currentMaterialId = - 1,
|
|
@@ -25065,6 +25069,18 @@ function WebGLRenderer( parameters ) {
|
|
|
|
|
|
};
|
|
|
|
|
|
+ this.getActiveCubeFace = function () {
|
|
|
+
|
|
|
+ return _currentActiveCubeFace;
|
|
|
+
|
|
|
+ };
|
|
|
+
|
|
|
+ this.getActiveMipMapLevel = function () {
|
|
|
+
|
|
|
+ return _currentActiveMipmapLevel;
|
|
|
+
|
|
|
+ };
|
|
|
+
|
|
|
this.getRenderTarget = function () {
|
|
|
|
|
|
return _currentRenderTarget;
|
|
@@ -25074,6 +25090,8 @@ function WebGLRenderer( parameters ) {
|
|
|
this.setRenderTarget = function ( renderTarget, activeCubeFace, activeMipMapLevel ) {
|
|
|
|
|
|
_currentRenderTarget = renderTarget;
|
|
|
+ _currentActiveCubeFace = activeCubeFace;
|
|
|
+ _currentActiveMipmapLevel = activeMipMapLevel;
|
|
|
|
|
|
if ( renderTarget && properties.get( renderTarget ).__webglFramebuffer === undefined ) {
|
|
|
|