language stringclasses 1
value | owner stringlengths 2 15 | repo stringlengths 2 21 | sha stringlengths 45 45 | message stringlengths 7 36.3k | path stringlengths 1 199 | patch stringlengths 15 102k | is_multipart bool 2
classes |
|---|---|---|---|---|---|---|---|
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/color_pars_vertex.glsl | @@ -0,0 +1,5 @@
+#ifdef USE_COLOR
+
+ varying vec3 vColor;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/color_vertex.glsl | @@ -0,0 +1,13 @@
+#ifdef USE_COLOR
+
+ #ifdef GAMMA_INPUT
+
+ vColor = color * color;
+
+ #else
+
+ vColor = color;
+
+ #endif
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/default_vertex.glsl | @@ -0,0 +1,21 @@
+vec4 mvPosition;
+
+#ifdef USE_SKINNING
+
+ mvPosition = modelViewMatrix * skinned;
+
+#endif
+
+#if !defined( USE_SKINNING ) && defined( USE_MORPHTARGETS )
+
+ mvPosition = modelViewMatrix * vec4( morphed, 1.0 );
+
+#endif
+
+#if !defined( USE_SKINNING ) && ! defined( USE_MORPHTARGETS )
+
+ mvPositio... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/defaultnormal_vertex.glsl | @@ -0,0 +1,27 @@
+vec3 objectNormal;
+
+#ifdef USE_SKINNING
+
+ objectNormal = skinnedNormal.xyz;
+
+#endif
+
+#if !defined( USE_SKINNING ) && defined( USE_MORPHNORMALS )
+
+ objectNormal = morphedNormal;
+
+#endif
+
+#if !defined( USE_SKINNING ) && ! defined( USE_MORPHNORMALS )
+
+ objectNormal = normal;
+
+#endif
+
+... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/envmap_fragment.glsl | @@ -0,0 +1,61 @@
+#ifdef USE_ENVMAP
+
+ vec3 reflectVec;
+
+ #if defined( USE_BUMPMAP ) || defined( USE_NORMALMAP )
+
+ vec3 cameraToVertex = normalize( vWorldPosition - cameraPosition );
+
+ // http://en.wikibooks.org/wiki/GLSL_Programming/Applying_Matrix_Transformations
+ // Transforming Normal Vectors with the In... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/envmap_pars_fragment.glsl | @@ -0,0 +1,19 @@
+#ifdef USE_ENVMAP
+
+ uniform float reflectivity;
+ uniform samplerCube envMap;
+ uniform float flipEnvMap;
+ uniform int combine;
+
+ #if defined( USE_BUMPMAP ) || defined( USE_NORMALMAP )
+
+ uniform bool useRefract;
+ uniform float refractionRatio;
+
+ #else
+
+ varying vec3 vReflect;
+
+ #endif... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/envmap_pars_vertex.glsl | @@ -0,0 +1,8 @@
+#if defined( USE_ENVMAP ) && ! defined( USE_BUMPMAP ) && ! defined( USE_NORMALMAP )
+
+ varying vec3 vReflect;
+
+ uniform float refractionRatio;
+ uniform bool useRefract;
+
+#endif | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/envmap_vertex.glsl | @@ -0,0 +1,18 @@
+#if defined( USE_ENVMAP ) && ! defined( USE_BUMPMAP ) && ! defined( USE_NORMALMAP )
+
+ vec3 worldNormal = mat3( modelMatrix[ 0 ].xyz, modelMatrix[ 1 ].xyz, modelMatrix[ 2 ].xyz ) * objectNormal;
+ worldNormal = normalize( worldNormal );
+
+ vec3 cameraToVertex = normalize( worldPosition.xyz - cameraP... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/fog_fragment.glsl | @@ -0,0 +1,27 @@
+#ifdef USE_FOG
+
+ #ifdef USE_LOGDEPTHBUF_EXT
+
+ float depth = gl_FragDepthEXT / gl_FragCoord.w;
+
+ #else
+
+ float depth = gl_FragCoord.z / gl_FragCoord.w;
+
+ #endif
+
+ #ifdef FOG_EXP2
+
+ const float LOG2 = 1.442695;
+ float fogFactor = exp2( - fogDensity * fogDensity * depth * depth * LOG2 ... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/fog_pars_fragment.glsl | @@ -0,0 +1,15 @@
+#ifdef USE_FOG
+
+ uniform vec3 fogColor;
+
+ #ifdef FOG_EXP2
+
+ uniform float fogDensity;
+
+ #else
+
+ uniform float fogNear;
+ uniform float fogFar;
+ #endif
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/lightmap_fragment.glsl | @@ -0,0 +1,5 @@
+#ifdef USE_LIGHTMAP
+
+ gl_FragColor = gl_FragColor * texture2D( lightMap, vUv2 );
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/lightmap_pars_fragment.glsl | @@ -0,0 +1,6 @@
+#ifdef USE_LIGHTMAP
+
+ varying vec2 vUv2;
+ uniform sampler2D lightMap;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/lightmap_pars_vertex.glsl | @@ -0,0 +1,5 @@
+#ifdef USE_LIGHTMAP
+
+ varying vec2 vUv2;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/lightmap_vertex.glsl | @@ -0,0 +1,5 @@
+#ifdef USE_LIGHTMAP
+
+ vUv2 = uv2;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/lights_lambert_pars_vertex.glsl | @@ -0,0 +1,45 @@
+uniform vec3 ambient;
+uniform vec3 diffuse;
+uniform vec3 emissive;
+
+uniform vec3 ambientLightColor;
+
+#if MAX_DIR_LIGHTS > 0
+
+ uniform vec3 directionalLightColor[ MAX_DIR_LIGHTS ];
+ uniform vec3 directionalLightDirection[ MAX_DIR_LIGHTS ];
+
+#endif
+
+#if MAX_HEMI_LIGHTS > 0
+
+ uniform vec3 ... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/lights_lambert_vertex.glsl | @@ -0,0 +1,202 @@
+vLightFront = vec3( 0.0 );
+
+#ifdef DOUBLE_SIDED
+
+ vLightBack = vec3( 0.0 );
+
+#endif
+
+transformedNormal = normalize( transformedNormal );
+
+#if MAX_DIR_LIGHTS > 0
+
+for( int i = 0; i < MAX_DIR_LIGHTS; i ++ ) {
+
+ vec4 lDirection = viewMatrix * vec4( directionalLightDirection[ i ], 0.0 );
+ ... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/lights_phong_fragment.glsl | @@ -0,0 +1,278 @@
+vec3 normal = normalize( vNormal );
+vec3 viewPosition = normalize( vViewPosition );
+
+#ifdef DOUBLE_SIDED
+
+ normal = normal * ( -1.0 + 2.0 * float( gl_FrontFacing ) );
+
+#endif
+
+#ifdef USE_NORMALMAP
+
+ normal = perturbNormal2Arb( -vViewPosition, normal );
+
+#elif defined( USE_BUMPMAP )
+
+ n... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/lights_phong_pars_fragment.glsl | @@ -0,0 +1,52 @@
+uniform vec3 ambientLightColor;
+
+#if MAX_DIR_LIGHTS > 0
+
+ uniform vec3 directionalLightColor[ MAX_DIR_LIGHTS ];
+ uniform vec3 directionalLightDirection[ MAX_DIR_LIGHTS ];
+
+#endif
+
+#if MAX_HEMI_LIGHTS > 0
+
+ uniform vec3 hemisphereLightSkyColor[ MAX_HEMI_LIGHTS ];
+ uniform vec3 hemisphereLig... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/lights_phong_pars_vertex.glsl | @@ -0,0 +1,5 @@
+#if MAX_SPOT_LIGHTS > 0 || defined( USE_BUMPMAP ) || defined( USE_ENVMAP )
+
+ varying vec3 vWorldPosition;
+
+#endif | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/lights_phong_vertex.glsl | @@ -0,0 +1,5 @@
+#if MAX_SPOT_LIGHTS > 0 || defined( USE_BUMPMAP ) || defined( USE_ENVMAP )
+
+ vWorldPosition = worldPosition.xyz;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/linear_to_gamma_fragment.glsl | @@ -0,0 +1,5 @@
+#ifdef GAMMA_OUTPUT
+
+ gl_FragColor.xyz = sqrt( gl_FragColor.xyz );
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/logdepthbuf_fragment.glsl | @@ -0,0 +1,5 @@
+#if defined(USE_LOGDEPTHBUF) && defined(USE_LOGDEPTHBUF_EXT)
+
+ gl_FragDepthEXT = log2(vFragDepth) * logDepthBufFC * 0.5;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/logdepthbuf_pars_fragment.glsl | @@ -0,0 +1,12 @@
+#ifdef USE_LOGDEPTHBUF
+
+ uniform float logDepthBufFC;
+
+ #ifdef USE_LOGDEPTHBUF_EXT
+
+ #extension GL_EXT_frag_depth : enable
+ varying float vFragDepth;
+
+ #endif
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/logdepthbuf_pars_vertex.glsl | @@ -0,0 +1,11 @@
+#ifdef USE_LOGDEPTHBUF
+
+ #ifdef USE_LOGDEPTHBUF_EXT
+
+ varying float vFragDepth;
+
+ #endif
+
+ uniform float logDepthBufFC;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/logdepthbuf_vertex.glsl | @@ -0,0 +1,15 @@
+#ifdef USE_LOGDEPTHBUF
+
+ gl_Position.z = log2(max(1e-6, gl_Position.w + 1.0)) * logDepthBufFC;
+
+ #ifdef USE_LOGDEPTHBUF_EXT
+
+ vFragDepth = 1.0 + gl_Position.w;
+
+#else
+
+ gl_Position.z = (gl_Position.z - 1.0) * gl_Position.w;
+
+ #endif
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/map_fragment.glsl | @@ -0,0 +1,13 @@
+#ifdef USE_MAP
+
+ vec4 texelColor = texture2D( map, vUv );
+
+ #ifdef GAMMA_INPUT
+
+ texelColor.xyz *= texelColor.xyz;
+
+ #endif
+
+ gl_FragColor = gl_FragColor * texelColor;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/map_pars_fragment.glsl | @@ -0,0 +1,11 @@
+#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP )
+
+ varying vec2 vUv;
+
+#endif
+
+#ifdef USE_MAP
+
+ uniform sampler2D map;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/map_pars_vertex.glsl | @@ -0,0 +1,6 @@
+#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP )
+
+ varying vec2 vUv;
+ uniform vec4 offsetRepeat;
+
+#endif | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/map_particle_fragment.glsl | @@ -0,0 +1,5 @@
+#ifdef USE_MAP
+
+ gl_FragColor = gl_FragColor * texture2D( map, vec2( gl_PointCoord.x, 1.0 - gl_PointCoord.y ) );
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/map_particle_pars_fragment.glsl | @@ -0,0 +1,5 @@
+#ifdef USE_MAP
+
+ uniform sampler2D map;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/map_vertex.glsl | @@ -0,0 +1,5 @@
+#if defined( USE_MAP ) || defined( USE_BUMPMAP ) || defined( USE_NORMALMAP ) || defined( USE_SPECULARMAP )
+
+ vUv = uv * offsetRepeat.zw + offsetRepeat.xy;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/morphnormal_vertex.glsl | @@ -0,0 +1,12 @@
+#ifdef USE_MORPHNORMALS
+
+ vec3 morphedNormal = vec3( 0.0 );
+
+ morphedNormal += ( morphNormal0 - normal ) * morphTargetInfluences[ 0 ];
+ morphedNormal += ( morphNormal1 - normal ) * morphTargetInfluences[ 1 ];
+ morphedNormal += ( morphNormal2 - normal ) * morphTargetInfluences[ 2 ];
+ morphedNorm... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/morphtarget_pars_vertex.glsl | @@ -0,0 +1,13 @@
+#ifdef USE_MORPHTARGETS
+
+ #ifndef USE_MORPHNORMALS
+
+ uniform float morphTargetInfluences[ 8 ];
+
+ #else
+
+ uniform float morphTargetInfluences[ 4 ];
+
+ #endif
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/morphtarget_vertex.glsl | @@ -0,0 +1,20 @@
+#ifdef USE_MORPHTARGETS
+
+ vec3 morphed = vec3( 0.0 );
+ morphed += ( morphTarget0 - position ) * morphTargetInfluences[ 0 ];
+ morphed += ( morphTarget1 - position ) * morphTargetInfluences[ 1 ];
+ morphed += ( morphTarget2 - position ) * morphTargetInfluences[ 2 ];
+ morphed += ( morphTarget3 - pos... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/normalmap_pars_fragment.glsl | @@ -0,0 +1,27 @@
+#ifdef USE_NORMALMAP
+
+ uniform sampler2D normalMap;
+ uniform vec2 normalScale;
+
+ // Per-Pixel Tangent Space Normal Mapping
+ // http://hacksoflife.blogspot.ch/2009/11/per-pixel-tangent-space-normal-mapping.html
+
+ vec3 perturbNormal2Arb( vec3 eye_pos, vec3 surf_norm ) {
+
+ vec3 q0 = dFdx( ... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/shadowmap_fragment.glsl | @@ -0,0 +1,220 @@
+#ifdef USE_SHADOWMAP
+
+ #ifdef SHADOWMAP_DEBUG
+
+ vec3 frustumColors[3];
+ frustumColors[0] = vec3( 1.0, 0.5, 0.0 );
+ frustumColors[1] = vec3( 0.0, 1.0, 0.8 );
+ frustumColors[2] = vec3( 0.0, 0.5, 1.0 );
+
+ #endif
+
+ #ifdef SHADOWMAP_CASCADE
+
+ int inFrustumCount = 0;
+
+ #endif
+
+ float ... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/shadowmap_pars_fragment.glsl | @@ -0,0 +1,19 @@
+#ifdef USE_SHADOWMAP
+
+ uniform sampler2D shadowMap[ MAX_SHADOWS ];
+ uniform vec2 shadowMapSize[ MAX_SHADOWS ];
+
+ uniform float shadowDarkness[ MAX_SHADOWS ];
+ uniform float shadowBias[ MAX_SHADOWS ];
+
+ varying vec4 vShadowCoord[ MAX_SHADOWS ];
+
+ float unpackDepth( const in vec4 rgba_depth ) ... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/shadowmap_pars_vertex.glsl | @@ -0,0 +1,6 @@
+#ifdef USE_SHADOWMAP
+
+ varying vec4 vShadowCoord[ MAX_SHADOWS ];
+ uniform mat4 shadowMatrix[ MAX_SHADOWS ];
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/shadowmap_vertex.glsl | @@ -0,0 +1,9 @@
+#ifdef USE_SHADOWMAP
+
+ for( int i = 0; i < MAX_SHADOWS; i ++ ) {
+
+ vShadowCoord[ i ] = shadowMatrix[ i ] * worldPosition;
+
+ }
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/skinbase_vertex.glsl | @@ -0,0 +1,8 @@
+#ifdef USE_SKINNING
+
+ mat4 boneMatX = getBoneMatrix( skinIndex.x );
+ mat4 boneMatY = getBoneMatrix( skinIndex.y );
+ mat4 boneMatZ = getBoneMatrix( skinIndex.z );
+ mat4 boneMatW = getBoneMatrix( skinIndex.w );
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/skinning_pars_vertex.glsl | @@ -0,0 +1,44 @@
+#ifdef USE_SKINNING
+
+ #ifdef BONE_TEXTURE
+
+ uniform sampler2D boneTexture;
+ uniform int boneTextureWidth;
+ uniform int boneTextureHeight;
+
+ mat4 getBoneMatrix( const in float i ) {
+
+ float j = i * 4.0;
+ float x = mod( j, float( boneTextureWidth ) );
+ float y = floor( j / float( b... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/skinning_vertex.glsl | @@ -0,0 +1,19 @@
+#ifdef USE_SKINNING
+
+ #ifdef USE_MORPHTARGETS
+
+ vec4 skinVertex = vec4( morphed, 1.0 );
+
+ #else
+
+ vec4 skinVertex = vec4( position, 1.0 );
+
+ #endif
+
+ vec4 skinned = vec4( 0.0 );
+ skinned += boneMatX * skinVertex * skinWeight.x;
+ skinned += boneMatY * skinVertex * skinWeight.y;
+ skinned ... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/skinnormal_vertex.glsl | @@ -0,0 +1,19 @@
+#ifdef USE_SKINNING
+
+ mat4 skinMatrix = mat4( 0.0 );
+ skinMatrix += skinWeight.x * boneMatX;
+ skinMatrix += skinWeight.y * boneMatY;
+ skinMatrix += skinWeight.z * boneMatZ;
+ skinMatrix += skinWeight.w * boneMatW;
+
+ #ifdef USE_MORPHNORMALS
+
+ vec4 skinnedNormal = skinMatrix * vec4( morphedNorm... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/specularmap_fragment.glsl | @@ -0,0 +1,12 @@
+float specularStrength;
+
+#ifdef USE_SPECULARMAP
+
+ vec4 texelSpecular = texture2D( specularMap, vUv );
+ specularStrength = texelSpecular.r;
+
+#else
+
+ specularStrength = 1.0;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/specularmap_pars_fragment.glsl | @@ -0,0 +1,5 @@
+#ifdef USE_SPECULARMAP
+
+ uniform sampler2D specularMap;
+
+#endif
\ No newline at end of file | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | src/renderers/shaders/ShaderChunk/worldpos_vertex.glsl | @@ -0,0 +1,21 @@
+#if defined( USE_ENVMAP ) || defined( PHONG ) || defined( LAMBERT ) || defined ( USE_SHADOWMAP )
+
+ #ifdef USE_SKINNING
+
+ vec4 worldPosition = modelMatrix * skinned;
+
+ #endif
+
+ #if defined( USE_MORPHTARGETS ) && ! defined( USE_SKINNING )
+
+ vec4 worldPosition = modelMatrix * vec4( morphed, 1... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | utils/build/build.py | @@ -60,8 +60,15 @@ def main(argv=None):
filename = '../../' + filename;
sources.append(filename)
with open(filename, 'r') as f:
- tmp.write(f.read())
- tmp.write('\n')
+ if filename.endswith(".glsl"):
+ tmp.write('THREE.ShaderChunk = THREE.ShaderChunk || {};')
+ tmp.write('THREE.ShaderChunk... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | utils/build/includes/common.json | @@ -80,7 +80,56 @@
"src/scenes/Fog.js",
"src/scenes/FogExp2.js",
"src/renderers/CanvasRenderer.js",
- "src/renderers/shaders/ShaderChunk.js",
+ "src/renderers/shaders/ShaderChunk/alphatest_fragment.glsl",
+ "src/renderers/shaders/ShaderChunk/lights_lambert_vertex.glsl",
+ "src/renderers/shaders/ShaderChunk/... | true |
Other | mrdoob | three.js | 8fcb3c06165d4616ba960fbfbb9e208fead9d64c.json | add glsl changes | utils/build/includes/webgl.json | @@ -70,7 +70,56 @@
"src/scenes/Scene.js",
"src/scenes/Fog.js",
"src/scenes/FogExp2.js",
- "src/renderers/shaders/ShaderChunk.js",
+ "src/renderers/shaders/ShaderChunk/alphatest_fragment.glsl",
+ "src/renderers/shaders/ShaderChunk/lights_lambert_vertex.glsl",
+ "src/renderers/shaders/ShaderChunk/map_particle... | true |
Other | mrdoob | three.js | 011770a86960e456bd64891f0e55149585181997.json | fix the way of removeing a mesh | src/renderers/WebGLRenderer.js | @@ -4030,7 +4030,7 @@ THREE.WebGLRenderer = function ( parameters ) {
function removeInstancesWebglObjects( objlist, object ) {
- delete objlist[object];
+ delete objlist[object.id];
};
| false |
Other | mrdoob | three.js | 953931d101bb4b0e4c82f7e1cd671a145f892c32.json | Fix a small problem in UCSCharacter | examples/js/UCSCharacter.js | @@ -41,7 +41,7 @@ THREE.UCSCharacter = function() {
geometry.computeBoundingBox();
geometry.computeVertexNormals();
- THREE.AnimationHandler.add( geometry.animation );
+ //THREE.AnimationHandler.add( geometry.animation );
mesh = new THREE.SkinnedMesh( geometry, new THREE.MeshFaceMaterial() );
sc... | false |
Other | mrdoob | three.js | caa4066afb1b2fbda8335aa69c2bffe3a46de8a1.json | fix some issues with the webgl renderer | src/extras/renderers/plugins/DepthPassPlugin.js | @@ -80,36 +80,12 @@ THREE.DepthPassPlugin = function () {
_renderList.length = 0;
projectObject(scene,scene,camera);
-
- /*_renderList = scene.__webglObjects;
-
- for ( j = 0, jl = renderList.length; j < jl; j ++ ) {
-
- webglObject = renderList[ j ];
- object = webglObject.object;
-
- webglObject.... | true |
Other | mrdoob | three.js | caa4066afb1b2fbda8335aa69c2bffe3a46de8a1.json | fix some issues with the webgl renderer | src/renderers/WebGLRenderer.js | @@ -222,16 +222,6 @@ THREE.WebGLRenderer = function ( parameters ) {
var _fragmentShaderPrecisionMediumpFloat = _gl.getShaderPrecisionFormat( _gl.FRAGMENT_SHADER, _gl.MEDIUM_FLOAT );
var _fragmentShaderPrecisionLowpFloat = _gl.getShaderPrecisionFormat( _gl.FRAGMENT_SHADER, _gl.LOW_FLOAT );
- /*
- var _vertexShade... | true |
Other | mrdoob | three.js | dd52b53039aeca2558495bdc3d02833165be658d.json | fix buffergeometry + remove comments | editor/index.html | @@ -9,7 +9,7 @@
<link href="css/types.css" rel="stylesheet" />
<link id="theme" href="css/light.css" rel="stylesheet" />
- <script src="../build/three.min.js"></script>
+ <script src="../build/three.js"></script>
<script src="../examples/js/libs/system.min.js"></script>
<script src="../examples/js/con... | true |
Other | mrdoob | three.js | dd52b53039aeca2558495bdc3d02833165be658d.json | fix buffergeometry + remove comments | editor/js/Menubar.Edit.js | @@ -47,8 +47,6 @@ Menubar.Edit = function ( editor ) {
if ( confirm( 'Convert ' + object.name + ' to BufferGeometry?' ) === false ) return;
- delete object.__webglInit; // TODO: Remove hack (WebGLRenderer refactoring) This is not yet fixed for buffergeometry
-
object.geometry = new THREE.BufferGeometry().... | true |
Other | mrdoob | three.js | dd52b53039aeca2558495bdc3d02833165be658d.json | fix buffergeometry + remove comments | src/renderers/WebGLRenderer.js | @@ -3690,55 +3690,55 @@ THREE.WebGLRenderer = function ( parameters ) {
object._modelViewMatrix = new THREE.Matrix4();
object._normalMatrix = new THREE.Matrix3();
- geometry = object.geometry;
+ }
+
+ geometry = object.geometry;
+
+ if ( geometry === undefined ) {
- if ( geometry === undefined ) ... | true |
Other | mrdoob | three.js | f4884bac7a11d9dcef86921f1e54c99a24fd98e4.json | change usage uuid to id. | src/extras/renderers/plugins/DepthPassPlugin.js | @@ -191,7 +191,7 @@ THREE.DepthPassPlugin = function () {
if ( object.visible ) {
- var webglObjects = scene.__webglObjects[object.uuid];
+ var webglObjects = scene.__webglObjects[object.id];
if (webglObjects && (object.frustumCulled === false || _frustum.intersectsObject( object ) === true) ) {
... | true |
Other | mrdoob | three.js | f4884bac7a11d9dcef86921f1e54c99a24fd98e4.json | change usage uuid to id. | src/extras/renderers/plugins/ShadowMapPlugin.js | @@ -333,7 +333,7 @@ THREE.ShadowMapPlugin = function () {
if ( object.visible ) {
- var webglObjects = scene.__webglObjects[object.uuid];
+ var webglObjects = scene.__webglObjects[object.id];
if (webglObjects && object.castShadow && (object.frustumCulled === false || _frustum.intersectsObject( obje... | true |
Other | mrdoob | three.js | f4884bac7a11d9dcef86921f1e54c99a24fd98e4.json | change usage uuid to id. | src/renderers/WebGLRenderer.js | @@ -3393,7 +3393,7 @@ THREE.WebGLRenderer = function ( parameters ) {
if ( object.visible ) {
- var webglObjects = scene.__webglObjects[object.uuid];
+ var webglObjects = scene.__webglObjects[object.id];
if (webglObjects && (object.frustumCulled === false || _frustum.intersectsObject( object ) ... | true |
Other | mrdoob | three.js | 5a9f8d7b6e5f7f35d208be9e3990ac7d2a4b0160.json | add depth pass plugin fix | src/extras/renderers/plugins/DepthPassPlugin.js | @@ -12,7 +12,8 @@ THREE.DepthPassPlugin = function () {
_depthMaterial, _depthMaterialMorph, _depthMaterialSkin, _depthMaterialMorphSkin,
_frustum = new THREE.Frustum(),
- _projScreenMatrix = new THREE.Matrix4();
+ _projScreenMatrix = new THREE.Matrix4(),
+ _renderList = [];
this.init = function ( renderer ) ... | false |
Other | mrdoob | three.js | 736f30b3f50b783df06c6d96ee8fd9b4354d98df.json | fix naming OpaqueObjects | src/renderers/WebGLRenderer.js | @@ -29,7 +29,7 @@ THREE.WebGLRenderer = function ( parameters ) {
_clearColor = new THREE.Color( 0x000000 ),
_clearAlpha = 0;
- var OpaqueObjects = [];
+ var opaqueObjects = [];
var transparentObjects = [];
var _sortObjects = true;
@@ -3304,15 +3304,15 @@ THREE.WebGLRenderer = function ( parameters ) {
... | false |
Other | mrdoob | three.js | 745502aff3600c884c20b5c2deb8474cbe358a8f.json | Add ambient color for palette | examples/js/renderers/SoftwareRenderer.js | @@ -245,10 +245,10 @@ THREE.SoftwareRenderer = function ( parameters ) {
context.fillRect( 0, 0, canvasWidth, canvasHeight );
}
- function getPalette( color, bSimulateSpecular ) {
- var diffuseR = color.r * 149;
- var diffuseG = color.g * 149;
- var diffuseB = color.b * 149;
+ function... | true |
Other | mrdoob | three.js | 745502aff3600c884c20b5c2deb8474cbe358a8f.json | Add ambient color for palette | examples/software_geometry_earth.html | @@ -70,7 +70,7 @@
var geometry = new THREE.SphereGeometry( 200, 20, 20 );
- var material = new THREE.MeshPhongMaterial( { map: texture, overdraw: 0.5 } );
+ var material = new THREE.MeshLambertMaterial( { map: texture, overdraw: 0.5 } );
var mesh = new THREE.Mesh( geometry, material );
gro... | true |
Other | mrdoob | three.js | ab88af6629f07b99ec777b9031c2ff0cfab8d9e9.json | Remove unused variable | examples/js/renderers/SoftwareRenderer.js | @@ -38,7 +38,6 @@ THREE.SoftwareRenderer = function ( parameters ) {
var blockShift = 3;
var blockSize = 1 << blockShift;
var maxZVal = (1 << 24); // Note: You want to size this so you don't get overflows.
- var maxTexCoordVal = 1; // Note: You want to size this so you don't get overflows.
var rectx1 = Inf... | false |
Other | mrdoob | three.js | c1034bc24bf6a36fff9d83e530279c044bb79829.json | Finish the texture mapping implementation. | examples/js/renderers/SoftwareRenderer.js | @@ -425,44 +425,37 @@ THREE.SoftwareRenderer = function ( parameters ) {
// UV interpolation setup
- var dtu12 = tu1 - tu2, dtu23 = tu2 - tu3, dtu31 = tu3 - tu1;
-// var dtudx = (invDet * (dtu12*dy31 - du31*dy12)); // dtu per one subpixel step in x
-// var dtudy = (invDet ... | false |
Other | mrdoob | three.js | 5e2412d26eac67259879d139683ddad08b6b5181.json | Create texture data and draw texture | examples/js/renderers/SoftwareRenderer.js | @@ -236,26 +236,45 @@ THREE.SoftwareRenderer = function ( parameters ) {
material instanceof THREE.SpriteMaterial ) {
var string;
-
- if ( material.vertexColors === THREE.FaceColors ) {
-
- string = [
- 'buffer[ offset ] = face.color.r * 255;',
- 'buffer[ offset + 1 ] = face.color.g * 2... | true |
Other | mrdoob | three.js | 5e2412d26eac67259879d139683ddad08b6b5181.json | Create texture data and draw texture | examples/software_geometry_earth.html | @@ -0,0 +1,176 @@
+<!DOCTYPE html>
+<html lang="en">
+ <head>
+ <title>three.js canvas - geometry - earth</title>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, user-scalable=no, minimum-scale=1.0, maximum-scale=1.0">
+ <style>
+ body {
+ color: #808080;
+ font-family:Monospac... | true |
Other | mrdoob | three.js | b1673f3716e7b0a7142d2b356c9ad4435ce544fc.json | transmit GLSL "defines" in ShaderPass
Otherwise we can't use defines in post processing shaders | examples/js/postprocessing/ShaderPass.js | @@ -10,6 +10,7 @@ THREE.ShaderPass = function ( shader, textureID ) {
this.material = new THREE.ShaderMaterial( {
+ defines: shader.defines || {},
uniforms: this.uniforms,
vertexShader: shader.vertexShader,
fragmentShader: shader.fragmentShader | false |
Other | mrdoob | three.js | 1729be414207740b8563d5212ee41f042dee4b26.json | reset enabled attributes list | src/renderers/WebGLRenderer.js | @@ -287,6 +287,9 @@ THREE.WebGLRenderer = function ( parameters ) {
_lightsNeedUpdate = true;
+ for ( var i = 0; i < _enabledAttributes.length; i ++ ) {
+ _enabledAttributes[ i ] = 0;
+ }
};
setDefaultGLState(); | false |
Other | mrdoob | three.js | daeac82fdaebc6e2b7b447d09bfa03c01b20e425.json | Change the way the extra info appears | utils/build/build.js | @@ -34,6 +34,9 @@ function main() {
var buffer = [];
var sources = [];
+
+ buffer.push('// You shouldn\'t edit this build file. \n');
+ buffer.push('// The following source code is build from the src folder. \n');
if ( args.amd ){
buffer.push('function ( root, factory ) {\n\n\tif ( typeof define === \'f... | true |
Other | mrdoob | three.js | daeac82fdaebc6e2b7b447d09bfa03c01b20e425.json | Change the way the extra info appears | utils/build/build.py | @@ -5,7 +5,7 @@
if sys.version_info < (2, 7):
print("This script requires at least Python 2.7.")
print("Please, update to a newer version: http://www.python.org/download/releases/")
- exit()
+# exit()
import argparse
import json
@@ -44,17 +44,18 @@ def main(argv=None):
fd, path = tempfile.mkstemp()
tmp = o... | true |
Other | mrdoob | three.js | 40102adda0cccdaf17a5e794e6e6fad0c254d920.json | Throw a decent error on missing font.
It throws an error when the font is missing.
Ex: "The font helvetiker with normal weight and normal style is missing.
Fixes #4923. | src/extras/FontUtils.js | @@ -33,7 +33,15 @@ THREE.FontUtils = {
getFace: function () {
- return this.faces[ this.face ][ this.weight ][ this.style ];
+ try {
+
+ return this.faces[ this.face ][ this.weight ][ this.style ];
+
+ } catch (e) {
+
+ throw "The font " + this.face + " with " + this.weight + " weight and " + this.style + ... | false |
Other | mrdoob | three.js | ea236d7cedfb8bb1c7bdcb5f360cf6f0062dd9b9.json | Add the file name before the code in Three.js | utils/build/build.py | @@ -52,6 +52,10 @@ def main(argv=None):
with open('includes/' + include + '.json','r') as f:
files = json.load(f)
for filename in files:
+ tmp.write('// You shouldn\'t edit this build file. \n')
+ tmp.write('// The following source code should be edited in \n')
+ tmp.write('// ' + filename)
+ tmp.writ... | false |
Other | mrdoob | three.js | ee6ef689f6520229e6adef7e0f14f4bdc27f7ef2.json | add uuid to docs | docs/api/core/Object3D.html | @@ -25,7 +25,13 @@ <h2>Properties</h2>
<h3>.[page:Integer id]</h3>
<div>
- Unique number of this object instance.
+ Identifier of this object instance.
+ </div>
+
+ <h3>.[page:String uuid]</h3>
+ <div>
+ [link:http://en.wikipedia.org/wiki/Universally_unique_identifier UUID] of this object instance.
+ ... | false |
Other | mrdoob | three.js | 86f082b95ca8442dc053dac1d72b4ccd532e180d.json | permute onProgress and onError in TGALoader | examples/js/loaders/TGALoader.js | @@ -9,7 +9,7 @@ THREE.TGALoader.prototype = {
constructor: THREE.TGALoader,
- load: function ( url, onLoad, onError, onProgress ) {
+ load: function ( url, onLoad, onProgress, onError ) {
var scope = this;
| false |
Other | mrdoob | three.js | 0f2e32eddcb18f5afe75b8a25958bd199fa127a6.json | fix coding style | src/extras/helpers/WireframeHelper.js | @@ -74,9 +74,9 @@ THREE.WireframeHelper = function ( object, hex ) {
var offsets = object.geometry.offsets;
var numEdges = 0;
- if (!offsets.length) {
+ if ( offsets.length === 0 ) {
- offsets = [{count : indices.length, index : 0, start : 0}];
+ offsets = [ { count : indices.length, index : 0, st... | false |
Other | mrdoob | three.js | 835f60d8b4b4948c908b10aaafa9828db3c3071a.json | Fix a encoding error
When I use this build tool, it occurs this error:
D:\3rd_projects\three.js-master\utils\build>python build.py --include common --i
nclude extras --output ../../build/three.js
* Building ../../build/three.js
Traceback (most recent call last):
File "build.py", line 106, in <module>
... | utils/build/build.py | @@ -42,21 +42,21 @@ def main(argv=None):
sourcemap = sourcemapping = sourcemapargs = ''
fd, path = tempfile.mkstemp()
- tmp = open(path, 'w')
+ tmp = open(path, 'w', encoding="utf-8")
sources = []
if args.amd:
tmp.write('( function ( root, factory ) {\n\n\tif ( typeof define === \'function\' && define... | false |
Other | mrdoob | three.js | 03a6f0b8ec04ad1222ec0aae6fda024e335e4f2d.json | Move THREE.MouseUtils.BUTTONS enum to THREE.MOUSE | examples/js/controls/OrbitControls.js | @@ -71,7 +71,7 @@ THREE.OrbitControls = function ( object, domElement ) {
this.keys = { LEFT: 37, UP: 38, RIGHT: 39, BOTTOM: 40 };
// Mouse buttons
- this.mouseButtons = { ORBIT: THREE.MouseUtils.BUTTONS.LEFT, ZOOM: THREE.MouseUtils.BUTTONS.MIDDLE, PAN: THREE.MouseUtils.BUTTONS.RIGHT };
+ this.mouseButtons = { OR... | true |
Other | mrdoob | three.js | 03a6f0b8ec04ad1222ec0aae6fda024e335e4f2d.json | Move THREE.MouseUtils.BUTTONS enum to THREE.MOUSE | src/Three.js | @@ -158,3 +158,11 @@ THREE.RGB_PVRTC_2BPPV1_Format = 2101;
THREE.RGBA_PVRTC_4BPPV1_Format = 2102;
THREE.RGBA_PVRTC_2BPPV1_Format = 2103;
*/
+
+// MouseEvent.button codes per https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent.button
+
+THREE.MOUSE = {
+ LEFT: 0,
+ MIDDLE: 1,
+ RIGHT: 2
+}; | true |
Other | mrdoob | three.js | 03a6f0b8ec04ad1222ec0aae6fda024e335e4f2d.json | Move THREE.MouseUtils.BUTTONS enum to THREE.MOUSE | src/extras/MouseUtils.js | @@ -1,8 +0,0 @@
-/**
- * @author yangchristian
- */
-
-THREE.MouseUtils = {
- // MouseEvent.button codes per https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent.button
- BUTTONS: { LEFT: 0, MIDDLE: 1, RIGHT: 2 }
-};
\ No newline at end of file | true |
Other | mrdoob | three.js | 03a6f0b8ec04ad1222ec0aae6fda024e335e4f2d.json | Move THREE.MouseUtils.BUTTONS enum to THREE.MOUSE | utils/build/includes/extras.json | @@ -1,7 +1,6 @@
[
"src/extras/GeometryUtils.js",
"src/extras/ImageUtils.js",
- "src/extras/MouseUtils.js",
"src/extras/SceneUtils.js",
"src/extras/FontUtils.js",
"src/extras/core/Curve.js", | true |
Other | mrdoob | three.js | 5d1f736f7ff1fd75545a89b9184ceceab0a7737f.json | Add THREE.MouseUtils with BUTTONS enum | examples/js/controls/OrbitControls.js | @@ -23,9 +23,6 @@
THREE.OrbitControls = function ( object, domElement ) {
- // MouseEvent.button codes per https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent.button
- var MOUSEBUTTONS = { LEFT: 0, MIDDLE: 1, RIGHT: 2 };
-
this.object = object;
this.domElement = ( domElement !== undefined ) ? domElemen... | true |
Other | mrdoob | three.js | 5d1f736f7ff1fd75545a89b9184ceceab0a7737f.json | Add THREE.MouseUtils with BUTTONS enum | src/extras/MouseUtils.js | @@ -0,0 +1,8 @@
+/**
+ * @author yangchristian
+ */
+
+THREE.MouseUtils = {
+ // MouseEvent.button codes per https://developer.mozilla.org/en-US/docs/Web/API/MouseEvent.button
+ BUTTONS: { LEFT: 0, MIDDLE: 1, RIGHT: 2 }
+};
\ No newline at end of file | true |
Other | mrdoob | three.js | 5d1f736f7ff1fd75545a89b9184ceceab0a7737f.json | Add THREE.MouseUtils with BUTTONS enum | utils/build/includes/extras.json | @@ -1,6 +1,7 @@
[
"src/extras/GeometryUtils.js",
"src/extras/ImageUtils.js",
+ "src/extras/MouseUtils.js",
"src/extras/SceneUtils.js",
"src/extras/FontUtils.js",
"src/extras/core/Curve.js", | true |
Other | mrdoob | three.js | b17e3a5d557521fa9195267195de4305b276c464.json | Add clone property to BufferAttribute.js
Based off BufferGeometry implementation | src/core/BufferAttribute.js | @@ -100,6 +100,31 @@ THREE.BufferAttribute.prototype = {
return this;
+ },
+
+ clone: function () {
+
+ var attribute = new THREE.BufferAttribute( null, this.itemSize );
+
+ var types = [ Int8Array, Uint8Array, Uint8ClampedArray, Int16Array, Uint16Array, Int32Array, Uint32Array, Float32Array, Float64Array ];
+... | false |
Other | mrdoob | three.js | d45049f2f71b49f1202e9f29642c7473a4450fed.json | Warn user if we change their texture settings.
If the user set a wrapS or wrapT parameter we should warn him if his
texture is not power of two. We should also warn him if his minFilter
is changing. | src/renderers/WebGLRenderer.js | @@ -5752,10 +5752,17 @@ THREE.WebGLRenderer = function ( parameters ) {
_gl.texParameteri( textureType, _gl.TEXTURE_WRAP_S, _gl.CLAMP_TO_EDGE );
_gl.texParameteri( textureType, _gl.TEXTURE_WRAP_T, _gl.CLAMP_TO_EDGE );
+
+ if ( texture.wrapS !== THREE.ClampToEdgeWrapping || texture.wrapT !== THREE.ClampTo... | false |
Other | mrdoob | three.js | 40bf24157abd4d17555cd9afa49646b3e286d06e.json | add a simple example | docs/api/loaders/OBJLoader.html | @@ -50,6 +50,21 @@ <h3>[method:Object3D parse]( [page:String text] )</h3>
<h2>Example</h2>
+ <code>
+ // instantiate a loader
+ var loader = new THREE.OBJLoader();
+
+ // load a resource
+ loader.load(
+ // resource URL
+ 'models/skinned/UCS_config.json',
+ // Function when resource is loaded
+ func... | false |
Other | mrdoob | three.js | 6edb6265a3a0cb7791e0d7a805cc05a1f199b2cd.json | add Loader inheritance | docs/api/loaders/glTFLoader.html | @@ -7,7 +7,7 @@
<link type="text/css" rel="stylesheet" href="../../page.css" />
</head>
<body>
-
+ [page:Loader] →
<h1>[name]</h1>
<div class="desc"> | false |
Other | mrdoob | three.js | f1cd7a72fc2e9e191849f63f3246681d5e6fcc1f.json | fix some todos | docs/api/loaders/Loader.html | @@ -59,7 +59,7 @@ <h3>[method:Boolean needsTangents]( [page:Array materials] )</h3>
Checks if the loaded object needs tangents based on its materials.
</div>
- <h3>[method:todo updateProgress]( [page:object progress] )</h3>
+ <h3>[method:null updateProgress]( [page:object progress] )</h3>
<div>
[page:Ob... | false |
Other | mrdoob | three.js | e2cffeef012628f4ca0eaff42b9d973497f9845f.json | fix indentation in Blender exporter once more | utils/exporters/blender/2.65/scripts/addons/io_mesh_threejs/export_threejs.py | @@ -2181,7 +2181,7 @@ def generate_cameras(data):
"target" : generate_vec3([0, 0, 0])
}
- elif camera.id_data.type == "ORTHO":
+ elif camera.id_data.type == "ORTHO":
camera_string = TEMPLATE_CAMERA_ORTHO % {
... | false |
Other | mrdoob | three.js | 6ea8cbae63fd643abbaad3e57c0febbb54390c6f.json | remove 3 fingers controls from TrackballControls | examples/js/controls/TrackballControls.js | @@ -6,7 +6,7 @@
THREE.TrackballControls = function ( object, domElement ) {
var _this = this;
- var STATE = { NONE: -1, ROTATE: 0, ZOOM: 1, PAN: 2, TOUCH_ROTATE: 3, TOUCH_ZOOM: 4, TOUCH_PAN: 5 };
+ var STATE = { NONE: -1, ROTATE: 0, ZOOM: 1, PAN: 2, TOUCH_ROTATE: 3, TOUCH_ZOOM: 4 };
this.object = object;
thi... | false |
Other | mrdoob | three.js | af763d7aaff2f7bbfee4f4621b8d85db8ec759b5.json | Fix package.json to make 'npm install' work. | utils/build/package.json | @@ -1,7 +1,7 @@
{
"name": "three.js",
"description": "JavaScript 3D library",
- "version": "50dev",
+ "version": "0.0.0",
"homepage" : "http://threejs.org/",
"author": "three.js contributors",
"help": { | false |
Other | mrdoob | three.js | a321ba05f02ae3a1586a4060a53f5ad63b90729b.json | handle another case of line continuation | examples/js/loaders/OBJLoader.js | @@ -192,7 +192,7 @@ THREE.OBJLoader.prototype = {
// fixes
- text = text.replace( /\\\r\n/g, '' ); // handles line continuations \
+ text = text.replace( /\\\r?\n/g, '' ); // handles line continuations \
var lines = text.split( '\n' );
| false |
Other | mrdoob | three.js | 17c71cecde70212a2ed2ddb0ab08a258c8e3af12.json | Remove duplicate test distanceToPoint for Box2.js | test/unit/math/Box2.js | @@ -174,21 +174,6 @@ test( "distanceToPoint", function() {
ok( b.distanceToPoint( new THREE.Vector2( -2, -2 ) ) == Math.sqrt( 2 ), "Passed!" );
});
-test( "distanceToPoint", function() {
- var a = new THREE.Box2( zero2.clone(), zero2.clone() );
- var b = new THREE.Box2( one2.clone().negate(), one2.clone() );
-
- o... | false |
Other | mrdoob | three.js | b632110d2d8ee69194b31ad2022408b1afb44520.json | add License info to minified build | utils/build/build.py | @@ -79,7 +79,7 @@ def main(argv=None):
# header
with open(output,'r') as f: text = f.read()
- with open(output,'w') as f: f.write('// three.js - http://github.com/mrdoob/three.js\n' + text + sourcemapping)
+ with open(output,'w') as f: f.write('// three.js - http://github.com/mrdoob/three.js\n// Released unde... | false |
Other | mrdoob | three.js | 85a7725cbafed1d892e156a0570e178198bef26a.json | Add browserify support - Fixes #4777 | src/Three.js | @@ -6,6 +6,11 @@
var THREE = { REVISION: '68dev' };
+// browserify support
+if (typeof module === 'object') {
+ module.exports = THREE;
+}
+
self.console = self.console || {
info: function () {}, | false |
Other | mrdoob | three.js | 3a950516947a41bfaf650a59347d35ebeb38f21a.json | Add a touch of damping to OrbitControls
Inspired by damping in TrackballControls, adds a little bit of kinetic
friction to OrbitControls. This makes the rotation controls feel much
more physical.
Damping is disabled by default, preserving the existing behavior.
Damping is enabled explicitly in the example. | examples/js/controls/OrbitControls.js | @@ -71,6 +71,14 @@ THREE.OrbitControls = function ( object, domElement ) {
// The four arrow keys
this.keys = { LEFT: 37, UP: 38, RIGHT: 39, BOTTOM: 40 };
+ // A little bit of damping, as if the mouse movement imparts momentum which
+ // is carried away by kinetic friction. On each update, a step is taken
+ // pr... | true |
Other | mrdoob | three.js | 3a950516947a41bfaf650a59347d35ebeb38f21a.json | Add a touch of damping to OrbitControls
Inspired by damping in TrackballControls, adds a little bit of kinetic
friction to OrbitControls. This makes the rotation controls feel much
more physical.
Damping is disabled by default, preserving the existing behavior.
Damping is enabled explicitly in the example. | examples/misc_controls_orbit.html | @@ -55,12 +55,20 @@
init();
render();
+ function animate() {
+
+ requestAnimationFrame(animate);
+ controls.update();
+
+ }
+
function init() {
camera = new THREE.PerspectiveCamera( 60, window.innerWidth / window.innerHeight, 1, 1000 );
camera.position.z = 500;
controls = new ... | true |
Other | mrdoob | three.js | 6f01c2dc4b9c79a555de5e0cadb25f8bc825c7af.json | Add SVGLoader. See #4429 | src/loaders/SVGLoader.js | @@ -0,0 +1,31 @@
+/**
+ * @author mrdoob / http://mrdoob.com/
+ * @author zz85 / http://joshuakoo.com/
+ */
+
+THREE.SVGLoader = function ( manager ) {
+
+ this.manager = ( manager !== undefined ) ? manager : THREE.DefaultLoadingManager;
+
+};
+
+THREE.SVGLoader.prototype = {
+
+ constructor: THREE.Materia... | false |
Other | mrdoob | three.js | 8375a6f421c3a761b48fa2c26318d92b7fc8fd49.json | Use clamp for clampScalar implementation | src/math/Vector2.js | @@ -226,46 +226,45 @@ THREE.Vector2.prototype = {
return this;
},
- clampScalar: function ( minVal, maxVal ) {
-
- if ( this.x < minVal ) {
- this.x = minVal;
- } else if ( this.x > maxVal ) {
- this.x = maxVal;
- }
-
- if ( this.y < minVal ) {
- th... | true |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.