super-three 0.160.1 → 0.162.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +1 -1
- package/build/three.cjs +867 -499
- package/build/three.module.js +867 -496
- package/build/three.module.min.js +1 -1
- package/examples/jsm/Addons.js +5 -1
- package/examples/jsm/capabilities/WebGPU.js +13 -9
- package/examples/jsm/controls/DragControls.js +91 -30
- package/examples/jsm/controls/OrbitControls.js +130 -15
- package/examples/jsm/controls/TransformControls.js +6 -6
- package/examples/jsm/curves/NURBSUtils.js +59 -4
- package/examples/jsm/curves/NURBSVolume.js +62 -0
- package/examples/jsm/exporters/GLTFExporter.js +11 -1
- package/examples/jsm/exporters/USDZExporter.js +8 -7
- package/examples/jsm/helpers/TextureHelper.js +3 -3
- package/examples/jsm/interactive/InteractiveGroup.js +15 -25
- package/examples/jsm/libs/rhino3dm/rhino3dm.js +1 -8723
- package/examples/jsm/libs/rhino3dm/rhino3dm.module.js +1 -8734
- package/examples/jsm/libs/rhino3dm/rhino3dm.wasm +0 -0
- package/examples/jsm/libs/tween.module.js +32 -14
- package/examples/jsm/loaders/3DMLoader.js +57 -64
- package/examples/jsm/loaders/DDSLoader.js +1 -0
- package/examples/jsm/loaders/KTX2Loader.js +20 -5
- package/examples/jsm/loaders/LUT3dlLoader.js +78 -46
- package/examples/jsm/loaders/LUTCubeLoader.js +81 -67
- package/examples/jsm/loaders/LUTImageLoader.js +3 -2
- package/examples/jsm/loaders/MaterialXLoader.js +115 -16
- package/examples/jsm/loaders/SVGLoader.js +4 -3
- package/examples/jsm/loaders/VOXLoader.js +9 -2
- package/examples/jsm/loaders/VRMLLoader.js +7 -3
- package/examples/jsm/materials/MeshPostProcessingMaterial.js +144 -0
- package/examples/jsm/misc/ProgressiveLightMap.js +1 -0
- package/examples/jsm/misc/Timer.js +13 -4
- package/examples/jsm/nodes/Nodes.js +24 -11
- package/examples/jsm/nodes/accessors/AccessorsUtils.js +10 -0
- package/examples/jsm/nodes/accessors/BufferAttributeNode.js +5 -3
- package/examples/jsm/nodes/accessors/CameraNode.js +9 -4
- package/examples/jsm/nodes/accessors/ClippingNode.js +144 -0
- package/examples/jsm/nodes/accessors/CubeTextureNode.js +12 -1
- package/examples/jsm/nodes/accessors/MaterialNode.js +2 -2
- package/examples/jsm/nodes/accessors/MaterialReferenceNode.js +2 -12
- package/examples/jsm/nodes/accessors/MorphNode.js +8 -8
- package/examples/jsm/nodes/accessors/ReferenceNode.js +87 -29
- package/examples/jsm/nodes/accessors/SkinningNode.js +31 -10
- package/examples/jsm/nodes/accessors/StorageBufferNode.js +45 -0
- package/examples/jsm/nodes/accessors/TangentNode.js +8 -2
- package/examples/jsm/nodes/accessors/TextureNode.js +1 -1
- package/examples/jsm/nodes/accessors/TextureStoreNode.js +56 -3
- package/examples/jsm/nodes/accessors/UniformsNode.js +140 -0
- package/examples/jsm/nodes/accessors/VertexColorNode.js +70 -0
- package/examples/jsm/nodes/code/CodeNode.js +6 -0
- package/examples/jsm/nodes/core/AssignNode.js +68 -12
- package/examples/jsm/nodes/core/AttributeNode.js +1 -1
- package/examples/jsm/nodes/core/Node.js +14 -4
- package/examples/jsm/nodes/core/NodeBuilder.js +26 -27
- package/examples/jsm/nodes/core/NodeFrame.js +18 -10
- package/examples/jsm/nodes/core/TempNode.js +1 -1
- package/examples/jsm/nodes/core/constants.js +1 -0
- package/examples/jsm/nodes/display/AfterImageNode.js +148 -0
- package/examples/jsm/nodes/display/AnamorphicNode.js +148 -0
- package/examples/jsm/nodes/display/BlendModeNode.js +30 -1
- package/examples/jsm/nodes/display/ColorAdjustmentNode.js +3 -0
- package/examples/jsm/nodes/display/GaussianBlurNode.js +33 -13
- package/examples/jsm/nodes/display/NormalMapNode.js +3 -5
- package/examples/jsm/nodes/display/PassNode.js +3 -2
- package/examples/jsm/nodes/display/ToneMappingNode.js +46 -3
- package/examples/jsm/nodes/display/ViewportDepthTextureNode.js +1 -4
- package/examples/jsm/nodes/display/ViewportNode.js +0 -2
- package/examples/jsm/nodes/display/ViewportSharedTextureNode.js +4 -4
- package/examples/jsm/nodes/fog/FogNode.js +2 -1
- package/examples/jsm/nodes/lighting/AmbientLightNode.js +1 -1
- package/examples/jsm/nodes/lighting/AnalyticLightNode.js +13 -5
- package/examples/jsm/nodes/lighting/LightingContextNode.js +1 -1
- package/examples/jsm/nodes/lighting/LightsNode.js +1 -1
- package/examples/jsm/nodes/materials/Line2NodeMaterial.js +18 -30
- package/examples/jsm/nodes/materials/Materials.js +1 -0
- package/examples/jsm/nodes/materials/MeshSSSNodeMaterial.js +84 -0
- package/examples/jsm/nodes/materials/NodeMaterial.js +43 -10
- package/examples/jsm/nodes/materials/SpriteNodeMaterial.js +1 -7
- package/examples/jsm/nodes/math/CondNode.js +42 -7
- package/examples/jsm/nodes/math/MathNode.js +32 -2
- package/examples/jsm/nodes/math/MathUtils.js +15 -0
- package/examples/jsm/nodes/math/OperatorNode.js +13 -5
- package/examples/jsm/nodes/math/TriNoise3D.js +71 -0
- package/examples/jsm/nodes/shadernode/ShaderNode.js +10 -1
- package/examples/jsm/nodes/utils/JoinNode.js +2 -2
- package/examples/jsm/nodes/utils/LoopNode.js +5 -3
- package/examples/jsm/nodes/utils/ReflectorNode.js +227 -0
- package/examples/jsm/nodes/utils/RotateNode.js +68 -0
- package/examples/jsm/nodes/utils/RotateUVNode.js +1 -9
- package/examples/jsm/nodes/utils/SplitNode.js +4 -4
- package/examples/jsm/nodes/utils/StorageArrayElementNode.js +91 -0
- package/examples/jsm/objects/GroundedSkybox.js +50 -0
- package/examples/jsm/objects/QuadMesh.js +8 -2
- package/examples/jsm/objects/Water2.js +8 -8
- package/examples/jsm/postprocessing/GTAOPass.js +11 -1
- package/examples/jsm/postprocessing/OutputPass.js +2 -0
- package/examples/jsm/renderers/common/Backend.js +14 -0
- package/examples/jsm/renderers/common/Background.js +2 -2
- package/examples/jsm/renderers/common/Bindings.js +1 -1
- package/examples/jsm/renderers/common/ClippingContext.js +165 -0
- package/examples/jsm/renderers/common/DataMap.js +1 -1
- package/examples/jsm/renderers/common/Info.js +25 -1
- package/examples/jsm/renderers/common/Pipelines.js +8 -8
- package/examples/jsm/renderers/common/PostProcessing.js +2 -2
- package/examples/jsm/renderers/common/ProgrammableStage.js +3 -1
- package/examples/jsm/renderers/common/RenderContext.js +2 -0
- package/examples/jsm/renderers/common/RenderContexts.js +2 -13
- package/examples/jsm/renderers/common/RenderObject.js +46 -1
- package/examples/jsm/renderers/common/RenderObjects.js +3 -1
- package/examples/jsm/renderers/common/Renderer.js +290 -17
- package/examples/jsm/renderers/common/StorageBufferAttribute.js +17 -0
- package/examples/jsm/renderers/common/StorageInstancedBufferAttribute.js +17 -0
- package/examples/jsm/renderers/common/Textures.js +28 -18
- package/examples/jsm/renderers/common/UniformsGroup.js +6 -4
- package/examples/jsm/renderers/common/nodes/NodeBuilderState.js +2 -1
- package/examples/jsm/renderers/common/nodes/NodeStorageBuffer.js +23 -0
- package/examples/jsm/renderers/common/nodes/NodeUniformBuffer.js +23 -0
- package/examples/jsm/renderers/common/nodes/Nodes.js +5 -2
- package/examples/jsm/renderers/webgl/WebGLBackend.js +653 -272
- package/examples/jsm/renderers/webgl/nodes/GLSLNodeBuilder.js +171 -39
- package/examples/jsm/renderers/webgl/utils/WebGLAttributeUtils.js +95 -8
- package/examples/jsm/renderers/webgl/utils/WebGLConstants.js +11 -0
- package/examples/jsm/renderers/webgl/utils/WebGLState.js +197 -0
- package/examples/jsm/renderers/webgl/utils/WebGLTextureUtils.js +424 -11
- package/examples/jsm/renderers/webgl/utils/WebGLUtils.js +3 -2
- package/examples/jsm/renderers/webgl-legacy/nodes/GLSL1NodeBuilder.js +1 -21
- package/examples/jsm/renderers/webgl-legacy/nodes/WebGLNodeBuilder.js +2 -2
- package/examples/jsm/renderers/webgpu/WebGPUBackend.js +300 -112
- package/examples/jsm/renderers/webgpu/WebGPURenderer.js +7 -2
- package/examples/jsm/renderers/webgpu/nodes/WGSLNodeBuilder.js +71 -79
- package/examples/jsm/renderers/webgpu/utils/WebGPUAttributeUtils.js +15 -1
- package/examples/jsm/renderers/webgpu/utils/WebGPUPipelineUtils.js +38 -4
- package/examples/jsm/renderers/webgpu/utils/WebGPUTextureUtils.js +87 -14
- package/examples/jsm/shaders/OutputShader.js +4 -0
- package/examples/jsm/transpiler/AST.js +1 -1
- package/examples/jsm/transpiler/GLSLDecoder.js +1 -1
- package/examples/jsm/transpiler/ShaderToyDecoder.js +1 -1
- package/examples/jsm/transpiler/TSLEncoder.js +1 -1
- package/examples/jsm/utils/BufferGeometryUtils.js +23 -27
- package/examples/jsm/utils/SkeletonUtils.js +14 -3
- package/examples/jsm/utils/SortUtils.js +2 -0
- package/examples/jsm/webxr/ARButton.js +12 -2
- package/examples/jsm/webxr/VRButton.js +25 -7
- package/examples/jsm/webxr/XRButton.js +12 -3
- package/examples/jsm/webxr/XRControllerModelFactory.js +14 -1
- package/examples/jsm/webxr/XRHandMeshModel.js +3 -1
- package/package.json +5 -4
- package/src/Three.Legacy.js +20 -0
- package/src/Three.js +0 -1
- package/src/audio/Audio.js +1 -3
- package/src/cameras/PerspectiveCamera.js +35 -0
- package/src/constants.js +2 -6
- package/src/core/BufferAttribute.js +2 -12
- package/src/core/BufferGeometry.js +23 -29
- package/src/core/InterleavedBuffer.js +2 -1
- package/src/core/InterleavedBufferAttribute.js +20 -0
- package/src/core/Object3D.js +11 -0
- package/src/core/Raycaster.js +18 -4
- package/src/core/RenderTarget.js +44 -21
- package/src/extras/PMREMGenerator.js +2 -0
- package/src/extras/curves/EllipseCurve.js +2 -2
- package/src/helpers/SpotLightHelper.js +18 -1
- package/src/loaders/DataTextureLoader.js +0 -4
- package/src/loaders/MaterialLoader.js +1 -0
- package/src/loaders/ObjectLoader.js +2 -1
- package/src/materials/Material.js +2 -1
- package/src/materials/MeshBasicMaterial.js +3 -0
- package/src/materials/MeshLambertMaterial.js +3 -0
- package/src/materials/MeshPhongMaterial.js +3 -0
- package/src/materials/MeshStandardMaterial.js +3 -0
- package/src/materials/ShaderMaterial.js +2 -1
- package/src/math/Quaternion.js +13 -12
- package/src/math/Triangle.js +0 -30
- package/src/math/Vector3.js +7 -7
- package/src/objects/BatchedMesh.js +6 -7
- package/src/objects/InstancedMesh.js +53 -0
- package/src/objects/Mesh.js +0 -1
- package/src/objects/SkinnedMesh.js +0 -8
- package/src/renderers/WebGLCubeRenderTarget.js +1 -10
- package/src/renderers/WebGLRenderer.js +20 -23
- package/src/renderers/shaders/ShaderChunk/alphatest_fragment.glsl.js +9 -0
- package/src/renderers/shaders/ShaderChunk/clipping_planes_fragment.glsl.js +56 -11
- package/src/renderers/shaders/ShaderChunk/envmap_common_pars_fragment.glsl.js +1 -0
- package/src/renderers/shaders/ShaderChunk/envmap_fragment.glsl.js +1 -1
- package/src/renderers/shaders/ShaderChunk/envmap_physical_pars_fragment.glsl.js +2 -2
- package/src/renderers/shaders/ShaderChunk/map_fragment.glsl.js +1 -1
- package/src/renderers/shaders/ShaderChunk/morphinstance_vertex.glsl.js +14 -0
- package/src/renderers/shaders/ShaderChunk/morphtarget_pars_vertex.glsl.js +11 -2
- package/src/renderers/shaders/ShaderChunk/tonemapping_pars_fragment.glsl.js +38 -7
- package/src/renderers/shaders/ShaderChunk.js +2 -0
- package/src/renderers/shaders/ShaderLib/backgroundCube.glsl.js +3 -2
- package/src/renderers/shaders/ShaderLib/depth.glsl.js +3 -2
- package/src/renderers/shaders/ShaderLib/distanceRGBA.glsl.js +3 -2
- package/src/renderers/shaders/ShaderLib/linedashed.glsl.js +2 -1
- package/src/renderers/shaders/ShaderLib/meshbasic.glsl.js +2 -2
- package/src/renderers/shaders/ShaderLib/meshlambert.glsl.js +2 -1
- package/src/renderers/shaders/ShaderLib/meshmatcap.glsl.js +2 -2
- package/src/renderers/shaders/ShaderLib/meshnormal.glsl.js +4 -1
- package/src/renderers/shaders/ShaderLib/meshphong.glsl.js +2 -1
- package/src/renderers/shaders/ShaderLib/meshphysical.glsl.js +2 -1
- package/src/renderers/shaders/ShaderLib/meshtoon.glsl.js +2 -1
- package/src/renderers/shaders/ShaderLib/points.glsl.js +2 -1
- package/src/renderers/shaders/ShaderLib/shadow.glsl.js +1 -0
- package/src/renderers/shaders/ShaderLib/sprite.glsl.js +1 -1
- package/src/renderers/shaders/ShaderLib.js +2 -1
- package/src/renderers/shaders/UniformsLib.js +1 -0
- package/src/renderers/webgl/WebGLAttributes.js +2 -2
- package/src/renderers/webgl/WebGLBackground.js +18 -0
- package/src/renderers/webgl/WebGLCubeMaps.js +1 -1
- package/src/renderers/webgl/WebGLMaterials.js +24 -1
- package/src/renderers/webgl/WebGLMorphtargets.js +15 -8
- package/src/renderers/webgl/WebGLProgram.js +42 -4
- package/src/renderers/webgl/WebGLPrograms.js +38 -27
- package/src/renderers/webgl/WebGLState.js +11 -21
- package/src/renderers/webgl/WebGLTextures.js +170 -66
- package/src/renderers/webxr/WebXRDepthSensing.js +105 -0
- package/src/renderers/webxr/WebXRManager.js +46 -0
- package/src/scenes/Scene.js +8 -0
- package/src/textures/Source.js +1 -0
- package/src/textures/Texture.js +1 -29
- package/build/three.js +0 -54519
- package/build/three.min.js +0 -7
- package/examples/jsm/nodes/core/ArrayUniformNode.js +0 -26
- package/examples/jsm/objects/GroundProjectedSkybox.js +0 -172
- package/src/renderers/WebGLMultipleRenderTargets.js +0 -82
|
@@ -11,6 +11,7 @@ import { WebGLRenderTarget } from '../WebGLRenderTarget.js';
|
|
|
11
11
|
import { WebXRController } from './WebXRController.js';
|
|
12
12
|
import { DepthTexture } from '../../textures/DepthTexture.js';
|
|
13
13
|
import { DepthFormat, DepthStencilFormat, RGBAFormat, UnsignedByteType, UnsignedIntType, UnsignedInt248Type } from '../../constants.js';
|
|
14
|
+
import { WebXRDepthSensing } from './WebXRDepthSensing.js';
|
|
14
15
|
|
|
15
16
|
class WebXRManager extends EventDispatcher {
|
|
16
17
|
|
|
@@ -38,7 +39,10 @@ class WebXRManager extends EventDispatcher {
|
|
|
38
39
|
let glProjLayer = null;
|
|
39
40
|
let glBaseLayer = null;
|
|
40
41
|
let xrFrame = null;
|
|
42
|
+
|
|
43
|
+
const depthSensing = new WebXRDepthSensing();
|
|
41
44
|
const attributes = gl.getContextAttributes();
|
|
45
|
+
|
|
42
46
|
let initialRenderTarget = null;
|
|
43
47
|
let newRenderTarget = null;
|
|
44
48
|
|
|
@@ -175,6 +179,8 @@ class WebXRManager extends EventDispatcher {
|
|
|
175
179
|
_currentDepthNear = null;
|
|
176
180
|
_currentDepthFar = null;
|
|
177
181
|
|
|
182
|
+
depthSensing.reset();
|
|
183
|
+
|
|
178
184
|
// restore framebuffer/rendering state
|
|
179
185
|
|
|
180
186
|
renderer.setRenderTarget( initialRenderTarget );
|
|
@@ -582,6 +588,13 @@ class WebXRManager extends EventDispatcher {
|
|
|
582
588
|
|
|
583
589
|
if ( session === null ) return;
|
|
584
590
|
|
|
591
|
+
if ( depthSensing.texture !== null ) {
|
|
592
|
+
|
|
593
|
+
camera.near = depthSensing.depthNear;
|
|
594
|
+
camera.far = depthSensing.depthFar;
|
|
595
|
+
|
|
596
|
+
}
|
|
597
|
+
|
|
585
598
|
cameraXR.near = cameraR.near = cameraL.near = camera.near;
|
|
586
599
|
cameraXR.far = cameraR.far = cameraL.far = camera.far;
|
|
587
600
|
|
|
@@ -597,6 +610,15 @@ class WebXRManager extends EventDispatcher {
|
|
|
597
610
|
_currentDepthNear = cameraXR.near;
|
|
598
611
|
_currentDepthFar = cameraXR.far;
|
|
599
612
|
|
|
613
|
+
cameraL.near = _currentDepthNear;
|
|
614
|
+
cameraL.far = _currentDepthFar;
|
|
615
|
+
cameraR.near = _currentDepthNear;
|
|
616
|
+
cameraR.far = _currentDepthFar;
|
|
617
|
+
|
|
618
|
+
cameraL.updateProjectionMatrix();
|
|
619
|
+
cameraR.updateProjectionMatrix();
|
|
620
|
+
camera.updateProjectionMatrix();
|
|
621
|
+
|
|
600
622
|
}
|
|
601
623
|
|
|
602
624
|
const cameras = cameraXR.cameras;
|
|
@@ -699,6 +721,12 @@ class WebXRManager extends EventDispatcher {
|
|
|
699
721
|
|
|
700
722
|
};
|
|
701
723
|
|
|
724
|
+
this.hasDepthSensing = function () {
|
|
725
|
+
|
|
726
|
+
return depthSensing.texture !== null;
|
|
727
|
+
|
|
728
|
+
};
|
|
729
|
+
|
|
702
730
|
// Animation Loop
|
|
703
731
|
|
|
704
732
|
let onAnimationFrameCallback = null;
|
|
@@ -791,6 +819,22 @@ class WebXRManager extends EventDispatcher {
|
|
|
791
819
|
|
|
792
820
|
}
|
|
793
821
|
|
|
822
|
+
//
|
|
823
|
+
|
|
824
|
+
const enabledFeatures = session.enabledFeatures;
|
|
825
|
+
|
|
826
|
+
if ( enabledFeatures && enabledFeatures.includes( 'depth-sensing' ) ) {
|
|
827
|
+
|
|
828
|
+
const depthData = glBinding.getDepthInformation( views[ 0 ] );
|
|
829
|
+
|
|
830
|
+
if ( depthData && depthData.isValid && depthData.texture ) {
|
|
831
|
+
|
|
832
|
+
depthSensing.init( renderer, depthData, session.renderState );
|
|
833
|
+
|
|
834
|
+
}
|
|
835
|
+
|
|
836
|
+
}
|
|
837
|
+
|
|
794
838
|
}
|
|
795
839
|
|
|
796
840
|
//
|
|
@@ -808,6 +852,8 @@ class WebXRManager extends EventDispatcher {
|
|
|
808
852
|
|
|
809
853
|
}
|
|
810
854
|
|
|
855
|
+
depthSensing.render( renderer, cameraXR );
|
|
856
|
+
|
|
811
857
|
if ( onAnimationFrameCallback ) onAnimationFrameCallback( time, frame );
|
|
812
858
|
|
|
813
859
|
if ( frame.detectedPlanes ) {
|
package/src/scenes/Scene.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Object3D } from '../core/Object3D.js';
|
|
2
|
+
import { Euler } from '../math/Euler.js';
|
|
2
3
|
|
|
3
4
|
class Scene extends Object3D {
|
|
4
5
|
|
|
@@ -16,6 +17,8 @@ class Scene extends Object3D {
|
|
|
16
17
|
|
|
17
18
|
this.backgroundBlurriness = 0;
|
|
18
19
|
this.backgroundIntensity = 1;
|
|
20
|
+
this.backgroundRotation = new Euler();
|
|
21
|
+
this.environmentRotation = new Euler();
|
|
19
22
|
|
|
20
23
|
this.overrideMaterial = null;
|
|
21
24
|
|
|
@@ -37,6 +40,8 @@ class Scene extends Object3D {
|
|
|
37
40
|
|
|
38
41
|
this.backgroundBlurriness = source.backgroundBlurriness;
|
|
39
42
|
this.backgroundIntensity = source.backgroundIntensity;
|
|
43
|
+
this.backgroundRotation.copy( source.backgroundRotation );
|
|
44
|
+
this.environmentRotation.copy( source.environmentRotation );
|
|
40
45
|
|
|
41
46
|
if ( source.overrideMaterial !== null ) this.overrideMaterial = source.overrideMaterial.clone();
|
|
42
47
|
|
|
@@ -54,6 +59,9 @@ class Scene extends Object3D {
|
|
|
54
59
|
if ( this.backgroundBlurriness > 0 ) data.object.backgroundBlurriness = this.backgroundBlurriness;
|
|
55
60
|
if ( this.backgroundIntensity !== 1 ) data.object.backgroundIntensity = this.backgroundIntensity;
|
|
56
61
|
|
|
62
|
+
data.object.backgroundRotation = this.backgroundRotation.toArray();
|
|
63
|
+
data.object.environmentRotation = this.environmentRotation.toArray();
|
|
64
|
+
|
|
57
65
|
return data;
|
|
58
66
|
|
|
59
67
|
}
|
package/src/textures/Source.js
CHANGED
package/src/textures/Texture.js
CHANGED
|
@@ -8,16 +8,12 @@ import {
|
|
|
8
8
|
LinearMipmapLinearFilter,
|
|
9
9
|
LinearFilter,
|
|
10
10
|
UVMapping,
|
|
11
|
-
sRGBEncoding,
|
|
12
|
-
SRGBColorSpace,
|
|
13
11
|
NoColorSpace,
|
|
14
|
-
LinearEncoding
|
|
15
12
|
} from '../constants.js';
|
|
16
13
|
import * as MathUtils from '../math/MathUtils.js';
|
|
17
14
|
import { Vector2 } from '../math/Vector2.js';
|
|
18
15
|
import { Matrix3 } from '../math/Matrix3.js';
|
|
19
16
|
import { Source } from './Source.js';
|
|
20
|
-
import { warnOnce } from '../utils.js';
|
|
21
17
|
|
|
22
18
|
let _textureId = 0;
|
|
23
19
|
|
|
@@ -66,17 +62,7 @@ class Texture extends EventDispatcher {
|
|
|
66
62
|
this.flipY = true;
|
|
67
63
|
this.unpackAlignment = 4; // valid values: 1, 2, 4, 8 (see http://www.khronos.org/opengles/sdk/docs/man/xhtml/glPixelStorei.xml)
|
|
68
64
|
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
this.colorSpace = colorSpace;
|
|
72
|
-
|
|
73
|
-
} else { // @deprecated, r152
|
|
74
|
-
|
|
75
|
-
warnOnce( 'THREE.Texture: Property .encoding has been replaced by .colorSpace.' );
|
|
76
|
-
this.colorSpace = colorSpace === sRGBEncoding ? SRGBColorSpace : NoColorSpace;
|
|
77
|
-
|
|
78
|
-
}
|
|
79
|
-
|
|
65
|
+
this.colorSpace = colorSpace;
|
|
80
66
|
|
|
81
67
|
this.userData = {};
|
|
82
68
|
|
|
@@ -315,20 +301,6 @@ class Texture extends EventDispatcher {
|
|
|
315
301
|
|
|
316
302
|
}
|
|
317
303
|
|
|
318
|
-
get encoding() { // @deprecated, r152
|
|
319
|
-
|
|
320
|
-
warnOnce( 'THREE.Texture: Property .encoding has been replaced by .colorSpace.' );
|
|
321
|
-
return this.colorSpace === SRGBColorSpace ? sRGBEncoding : LinearEncoding;
|
|
322
|
-
|
|
323
|
-
}
|
|
324
|
-
|
|
325
|
-
set encoding( encoding ) { // @deprecated, r152
|
|
326
|
-
|
|
327
|
-
warnOnce( 'THREE.Texture: Property .encoding has been replaced by .colorSpace.' );
|
|
328
|
-
this.colorSpace = encoding === sRGBEncoding ? SRGBColorSpace : NoColorSpace;
|
|
329
|
-
|
|
330
|
-
}
|
|
331
|
-
|
|
332
304
|
}
|
|
333
305
|
|
|
334
306
|
Texture.DEFAULT_IMAGE = null;
|