|
@@ -10,46 +10,12 @@ module BABYLON {
|
|
public ALPHATEST = false;
|
|
public ALPHATEST = false;
|
|
public POINTSIZE = false;
|
|
public POINTSIZE = false;
|
|
public FOG = false;
|
|
public FOG = false;
|
|
- public LIGHT0 = false;
|
|
|
|
- public LIGHT1 = false;
|
|
|
|
- public LIGHT2 = false;
|
|
|
|
- public LIGHT3 = false;
|
|
|
|
- public SPOTLIGHT0 = false;
|
|
|
|
- public SPOTLIGHT1 = false;
|
|
|
|
- public SPOTLIGHT2 = false;
|
|
|
|
- public SPOTLIGHT3 = false;
|
|
|
|
- public HEMILIGHT0 = false;
|
|
|
|
- public HEMILIGHT1 = false;
|
|
|
|
- public HEMILIGHT2 = false;
|
|
|
|
- public HEMILIGHT3 = false;
|
|
|
|
- public DIRLIGHT0 = false;
|
|
|
|
- public DIRLIGHT1 = false;
|
|
|
|
- public DIRLIGHT2 = false;
|
|
|
|
- public DIRLIGHT3 = false;
|
|
|
|
- public POINTLIGHT0 = false;
|
|
|
|
- public POINTLIGHT1 = false;
|
|
|
|
- public POINTLIGHT2 = false;
|
|
|
|
- public POINTLIGHT3 = false;
|
|
|
|
- public SHADOW0 = false;
|
|
|
|
- public SHADOW1 = false;
|
|
|
|
- public SHADOW2 = false;
|
|
|
|
- public SHADOW3 = false;
|
|
|
|
- public SHADOWS = false;
|
|
|
|
- public SHADOWVSM0 = false;
|
|
|
|
- public SHADOWVSM1 = false;
|
|
|
|
- public SHADOWVSM2 = false;
|
|
|
|
- public SHADOWVSM3 = false;
|
|
|
|
- public SHADOWPCF0 = false;
|
|
|
|
- public SHADOWPCF1 = false;
|
|
|
|
- public SHADOWPCF2 = false;
|
|
|
|
- public SHADOWPCF3 = false;
|
|
|
|
public NORMAL = false;
|
|
public NORMAL = false;
|
|
public UV1 = false;
|
|
public UV1 = false;
|
|
public UV2 = false;
|
|
public UV2 = false;
|
|
public VERTEXCOLOR = false;
|
|
public VERTEXCOLOR = false;
|
|
public VERTEXALPHA = false;
|
|
public VERTEXALPHA = false;
|
|
- public BONES = false;
|
|
|
|
- public BONES4 = false;
|
|
|
|
|
|
+ public NUM_BONE_INFLUENCERS = 0;
|
|
public BonesPerMesh = 0;
|
|
public BonesPerMesh = 0;
|
|
public INSTANCES = false;
|
|
public INSTANCES = false;
|
|
public HIGHLEVEL = false;
|
|
public HIGHLEVEL = false;
|
|
@@ -98,9 +64,11 @@ module BABYLON {
|
|
|
|
|
|
@serialize()
|
|
@serialize()
|
|
public highLevelFur: boolean = true;
|
|
public highLevelFur: boolean = true;
|
|
|
|
+
|
|
|
|
+ @serialize()
|
|
|
|
+ public maxSimultaneousLights = 4;
|
|
|
|
|
|
private _worldViewProjectionMatrix = Matrix.Zero();
|
|
private _worldViewProjectionMatrix = Matrix.Zero();
|
|
- private _scaledDiffuse = new Color3(1.,1.,1.);
|
|
|
|
private _renderId: number;
|
|
private _renderId: number;
|
|
|
|
|
|
private _furTime: number = 0;
|
|
private _furTime: number = 0;
|
|
@@ -219,82 +187,9 @@ module BABYLON {
|
|
this._defines.HIGHLEVEL = true;
|
|
this._defines.HIGHLEVEL = true;
|
|
}
|
|
}
|
|
|
|
|
|
- var lightIndex = 0;
|
|
|
|
|
|
+ // Lights
|
|
if (scene.lightsEnabled && !this.disableLighting) {
|
|
if (scene.lightsEnabled && !this.disableLighting) {
|
|
- for (var index = 0; index < scene.lights.length; index++) {
|
|
|
|
- var light = scene.lights[index];
|
|
|
|
-
|
|
|
|
- if (!light.isEnabled()) {
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- // Excluded check
|
|
|
|
- if (light._excludedMeshesIds.length > 0) {
|
|
|
|
- for (var excludedIndex = 0; excludedIndex < light._excludedMeshesIds.length; excludedIndex++) {
|
|
|
|
- var excludedMesh = scene.getMeshByID(light._excludedMeshesIds[excludedIndex]);
|
|
|
|
-
|
|
|
|
- if (excludedMesh) {
|
|
|
|
- light.excludedMeshes.push(excludedMesh);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- light._excludedMeshesIds = [];
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- // Included check
|
|
|
|
- if (light._includedOnlyMeshesIds.length > 0) {
|
|
|
|
- for (var includedOnlyIndex = 0; includedOnlyIndex < light._includedOnlyMeshesIds.length; includedOnlyIndex++) {
|
|
|
|
- var includedOnlyMesh = scene.getMeshByID(light._includedOnlyMeshesIds[includedOnlyIndex]);
|
|
|
|
-
|
|
|
|
- if (includedOnlyMesh) {
|
|
|
|
- light.includedOnlyMeshes.push(includedOnlyMesh);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- light._includedOnlyMeshesIds = [];
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (!light.canAffectMesh(mesh)) {
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
- needNormals = true;
|
|
|
|
- this._defines["LIGHT" + lightIndex] = true;
|
|
|
|
-
|
|
|
|
- var type;
|
|
|
|
- if (light instanceof SpotLight) {
|
|
|
|
- type = "SPOTLIGHT" + lightIndex;
|
|
|
|
- } else if (light instanceof HemisphericLight) {
|
|
|
|
- type = "HEMILIGHT" + lightIndex;
|
|
|
|
- } else if (light instanceof PointLight) {
|
|
|
|
- type = "POINTLIGHT" + lightIndex;
|
|
|
|
- } else {
|
|
|
|
- type = "DIRLIGHT" + lightIndex;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- this._defines[type] = true;
|
|
|
|
-
|
|
|
|
- // Shadows
|
|
|
|
- if (scene.shadowsEnabled) {
|
|
|
|
- var shadowGenerator = light.getShadowGenerator();
|
|
|
|
- if (mesh && mesh.receiveShadows && shadowGenerator) {
|
|
|
|
- this._defines["SHADOW" + lightIndex] = true;
|
|
|
|
-
|
|
|
|
- this._defines.SHADOWS = true;
|
|
|
|
-
|
|
|
|
- if (shadowGenerator.useVarianceShadowMap || shadowGenerator.useBlurVarianceShadowMap) {
|
|
|
|
- this._defines["SHADOWVSM" + lightIndex] = true;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (shadowGenerator.usePoissonSampling) {
|
|
|
|
- this._defines["SHADOWPCF" + lightIndex] = true;
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- lightIndex++;
|
|
|
|
- if (lightIndex === maxSimultaneousLights)
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
|
|
+ needNormals = MaterialHelper.PrepareDefinesForLights(scene, mesh, this._defines, this.maxSimultaneousLights);
|
|
}
|
|
}
|
|
|
|
|
|
// Attribs
|
|
// Attribs
|
|
@@ -317,10 +212,10 @@ module BABYLON {
|
|
this._defines.VERTEXALPHA = true;
|
|
this._defines.VERTEXALPHA = true;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
if (mesh.useBones && mesh.computeBonesUsingShaders) {
|
|
if (mesh.useBones && mesh.computeBonesUsingShaders) {
|
|
- this._defines.BONES = true;
|
|
|
|
|
|
+ this._defines.NUM_BONE_INFLUENCERS = mesh.numBoneInfluencers;
|
|
this._defines.BonesPerMesh = (mesh.skeleton.bones.length + 1);
|
|
this._defines.BonesPerMesh = (mesh.skeleton.bones.length + 1);
|
|
- this._defines.BONES4 = true;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
// Instances
|
|
// Instances
|
|
@@ -341,30 +236,10 @@ module BABYLON {
|
|
fallbacks.addFallback(1, "FOG");
|
|
fallbacks.addFallback(1, "FOG");
|
|
}
|
|
}
|
|
|
|
|
|
- for (lightIndex = 0; lightIndex < maxSimultaneousLights; lightIndex++) {
|
|
|
|
- if (!this._defines["LIGHT" + lightIndex]) {
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (lightIndex > 0) {
|
|
|
|
- fallbacks.addFallback(lightIndex, "LIGHT" + lightIndex);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (this._defines["SHADOW" + lightIndex]) {
|
|
|
|
- fallbacks.addFallback(0, "SHADOW" + lightIndex);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (this._defines["SHADOWPCF" + lightIndex]) {
|
|
|
|
- fallbacks.addFallback(0, "SHADOWPCF" + lightIndex);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (this._defines["SHADOWVSM" + lightIndex]) {
|
|
|
|
- fallbacks.addFallback(0, "SHADOWVSM" + lightIndex);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ MaterialHelper.HandleFallbacksForShadows(this._defines, fallbacks, this.maxSimultaneousLights);
|
|
|
|
|
|
- if (this._defines.BONES4) {
|
|
|
|
- fallbacks.addFallback(0, "BONES4");
|
|
|
|
|
|
+ if (this._defines.NUM_BONE_INFLUENCERS > 0) {
|
|
|
|
+ fallbacks.addCPUSkinningFallback(0, mesh);
|
|
}
|
|
}
|
|
|
|
|
|
//Attributes
|
|
//Attributes
|
|
@@ -386,40 +261,28 @@ module BABYLON {
|
|
attribs.push(VertexBuffer.ColorKind);
|
|
attribs.push(VertexBuffer.ColorKind);
|
|
}
|
|
}
|
|
|
|
|
|
- if (this._defines.BONES) {
|
|
|
|
- attribs.push(VertexBuffer.MatricesIndicesKind);
|
|
|
|
- attribs.push(VertexBuffer.MatricesWeightsKind);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (this._defines.INSTANCES) {
|
|
|
|
- attribs.push("world0");
|
|
|
|
- attribs.push("world1");
|
|
|
|
- attribs.push("world2");
|
|
|
|
- attribs.push("world3");
|
|
|
|
- }
|
|
|
|
|
|
+ MaterialHelper.PrepareAttributesForBones(attribs, mesh, this._defines, fallbacks);
|
|
|
|
+ MaterialHelper.PrepareAttributesForInstances(attribs, this._defines);
|
|
|
|
|
|
// Legacy browser patch
|
|
// Legacy browser patch
|
|
var shaderName = "fur";
|
|
var shaderName = "fur";
|
|
var join = this._defines.toString();
|
|
var join = this._defines.toString();
|
|
|
|
+ var uniforms = ["world", "view", "viewProjection", "vEyePosition", "vLightsType", "vDiffuseColor",
|
|
|
|
+ "vFogInfos", "vFogColor", "pointSize",
|
|
|
|
+ "vDiffuseInfos",
|
|
|
|
+ "mBones",
|
|
|
|
+ "vClipPlane", "diffuseMatrix",
|
|
|
|
+ "furLength", "furAngle", "furColor", "furOffset", "furGravity", "furTime", "furSpacing", "furDensity"
|
|
|
|
+ ];
|
|
|
|
+ var samplers = ["diffuseSampler",
|
|
|
|
+ "heightTexture", "furTexture"
|
|
|
|
+ ];
|
|
|
|
+
|
|
|
|
+ MaterialHelper.PrepareUniformsAndSamplersList(uniforms, samplers, this._defines, this.maxSimultaneousLights);
|
|
|
|
+
|
|
this._effect = scene.getEngine().createEffect(shaderName,
|
|
this._effect = scene.getEngine().createEffect(shaderName,
|
|
- attribs,
|
|
|
|
- ["world", "view", "viewProjection", "vEyePosition", "vLightsType", "vDiffuseColor",
|
|
|
|
- "vLightData0", "vLightDiffuse0", "vLightSpecular0", "vLightDirection0", "vLightGround0", "lightMatrix0",
|
|
|
|
- "vLightData1", "vLightDiffuse1", "vLightSpecular1", "vLightDirection1", "vLightGround1", "lightMatrix1",
|
|
|
|
- "vLightData2", "vLightDiffuse2", "vLightSpecular2", "vLightDirection2", "vLightGround2", "lightMatrix2",
|
|
|
|
- "vLightData3", "vLightDiffuse3", "vLightSpecular3", "vLightDirection3", "vLightGround3", "lightMatrix3",
|
|
|
|
- "vFogInfos", "vFogColor", "pointSize",
|
|
|
|
- "vDiffuseInfos",
|
|
|
|
- "mBones",
|
|
|
|
- "vClipPlane", "diffuseMatrix",
|
|
|
|
- "shadowsInfo0", "shadowsInfo1", "shadowsInfo2", "shadowsInfo3",
|
|
|
|
- "furLength", "furAngle", "furColor", "furOffset", "furGravity", "furTime", "furSpacing", "furDensity"
|
|
|
|
- ],
|
|
|
|
- ["diffuseSampler",
|
|
|
|
- "shadowSampler0", "shadowSampler1", "shadowSampler2", "shadowSampler3",
|
|
|
|
- "heightTexture", "furTexture"
|
|
|
|
- ],
|
|
|
|
- join, fallbacks, this.onCompiled, this.onError);
|
|
|
|
|
|
+ attribs, uniforms, samplers,
|
|
|
|
+ join, fallbacks, this.onCompiled, this.onError, { maxSimultaneousLights: this.maxSimultaneousLights });
|
|
}
|
|
}
|
|
if (!this._effect.isReady()) {
|
|
if (!this._effect.isReady()) {
|
|
return false;
|
|
return false;
|
|
@@ -451,9 +314,7 @@ module BABYLON {
|
|
this._effect.setMatrix("viewProjection", scene.getTransformMatrix());
|
|
this._effect.setMatrix("viewProjection", scene.getTransformMatrix());
|
|
|
|
|
|
// Bones
|
|
// Bones
|
|
- if (mesh && mesh.useBones && mesh.computeBonesUsingShaders) {
|
|
|
|
- this._effect.setMatrices("mBones", mesh.skeleton.getTransformMatrices(mesh));
|
|
|
|
- }
|
|
|
|
|
|
+ MaterialHelper.BindBonesParameters(mesh, this._effect);
|
|
|
|
|
|
if (scene.getCachedMaterial() !== this) {
|
|
if (scene.getCachedMaterial() !== this) {
|
|
// Textures
|
|
// Textures
|
|
@@ -469,10 +330,7 @@ module BABYLON {
|
|
}
|
|
}
|
|
|
|
|
|
// Clip plane
|
|
// Clip plane
|
|
- if (scene.clipPlane) {
|
|
|
|
- var clipPlane = scene.clipPlane;
|
|
|
|
- this._effect.setFloat4("vClipPlane", clipPlane.normal.x, clipPlane.normal.y, clipPlane.normal.z, clipPlane.d);
|
|
|
|
- }
|
|
|
|
|
|
+ MaterialHelper.BindClipPlane(this._effect, scene);
|
|
|
|
|
|
// Point size
|
|
// Point size
|
|
if (this.pointsCloud) {
|
|
if (this.pointsCloud) {
|
|
@@ -482,53 +340,10 @@ module BABYLON {
|
|
this._effect.setVector3("vEyePosition", scene._mirroredCameraPosition ? scene._mirroredCameraPosition : scene.activeCamera.position);
|
|
this._effect.setVector3("vEyePosition", scene._mirroredCameraPosition ? scene._mirroredCameraPosition : scene.activeCamera.position);
|
|
}
|
|
}
|
|
|
|
|
|
- this._effect.setColor4("vDiffuseColor", this._scaledDiffuse, this.alpha * mesh.visibility);
|
|
|
|
|
|
+ this._effect.setColor4("vDiffuseColor", this.diffuseColor, this.alpha * mesh.visibility);
|
|
|
|
|
|
if (scene.lightsEnabled && !this.disableLighting) {
|
|
if (scene.lightsEnabled && !this.disableLighting) {
|
|
- var lightIndex = 0;
|
|
|
|
- for (var index = 0; index < scene.lights.length; index++) {
|
|
|
|
- var light = scene.lights[index];
|
|
|
|
-
|
|
|
|
- if (!light.isEnabled()) {
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (!light.canAffectMesh(mesh)) {
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (light instanceof PointLight) {
|
|
|
|
- // Point Light
|
|
|
|
- light.transferToEffect(this._effect, "vLightData" + lightIndex);
|
|
|
|
- } else if (light instanceof DirectionalLight) {
|
|
|
|
- // Directional Light
|
|
|
|
- light.transferToEffect(this._effect, "vLightData" + lightIndex);
|
|
|
|
- } else if (light instanceof SpotLight) {
|
|
|
|
- // Spot Light
|
|
|
|
- light.transferToEffect(this._effect, "vLightData" + lightIndex, "vLightDirection" + lightIndex);
|
|
|
|
- } else if (light instanceof HemisphericLight) {
|
|
|
|
- // Hemispheric Light
|
|
|
|
- light.transferToEffect(this._effect, "vLightData" + lightIndex, "vLightGround" + lightIndex);
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- light.diffuse.scaleToRef(light.intensity, this._scaledDiffuse);
|
|
|
|
- this._effect.setColor4("vLightDiffuse" + lightIndex, this._scaledDiffuse, light.range);
|
|
|
|
-
|
|
|
|
- // Shadows
|
|
|
|
- if (scene.shadowsEnabled) {
|
|
|
|
- var shadowGenerator = light.getShadowGenerator();
|
|
|
|
- if (mesh.receiveShadows && shadowGenerator) {
|
|
|
|
- this._effect.setMatrix("lightMatrix" + lightIndex, shadowGenerator.getTransformMatrix());
|
|
|
|
- this._effect.setTexture("shadowSampler" + lightIndex, shadowGenerator.getShadowMapForRendering());
|
|
|
|
- this._effect.setFloat3("shadowsInfo" + lightIndex, shadowGenerator.getDarkness(), shadowGenerator.getShadowMap().getSize().width, shadowGenerator.bias);
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- lightIndex++;
|
|
|
|
-
|
|
|
|
- if (lightIndex === maxSimultaneousLights)
|
|
|
|
- break;
|
|
|
|
- }
|
|
|
|
|
|
+ MaterialHelper.BindLights(scene, mesh, this._effect, this._defines, this.maxSimultaneousLights);
|
|
}
|
|
}
|
|
|
|
|
|
// View
|
|
// View
|
|
@@ -537,10 +352,7 @@ module BABYLON {
|
|
}
|
|
}
|
|
|
|
|
|
// Fog
|
|
// Fog
|
|
- if (scene.fogEnabled && mesh.applyFog && scene.fogMode !== Scene.FOGMODE_NONE) {
|
|
|
|
- this._effect.setFloat4("vFogInfos", scene.fogMode, scene.fogStart, scene.fogEnd, scene.fogDensity);
|
|
|
|
- this._effect.setColor3("vFogColor", scene.fogColor);
|
|
|
|
- }
|
|
|
|
|
|
+ MaterialHelper.BindFogParameters(scene, mesh, this._effect);
|
|
|
|
|
|
this._effect.setFloat("furLength", this.furLength);
|
|
this._effect.setFloat("furLength", this.furLength);
|
|
this._effect.setFloat("furAngle", this.furAngle);
|
|
this._effect.setFloat("furAngle", this.furAngle);
|