Skip to content

Commit 36c994c

Browse files
committed
fix: refraction name
1 parent 141095a commit 36c994c

File tree

4 files changed

+4
-14
lines changed

4 files changed

+4
-14
lines changed

packages/core/src/material/PBRMaterial.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ export class PBRMaterial extends PBRBaseMaterial {
2929
private static _sheenTextureProp = ShaderProperty.getByName("material_SheenTexture");
3030
private static _sheenRoughnessTextureProp = ShaderProperty.getByName("material_SheenRoughnessTexture");
3131

32-
private static _refractionMacro: ShaderMacro = ShaderMacro.getByName("MATERIAL_ENABLE_TRANSMISSION");
33-
private static _transmissionMacro: ShaderMacro = ShaderMacro.getByName("MATERIAL_HAS_TRANSMISSION");
32+
private static _transmissionMacro: ShaderMacro = ShaderMacro.getByName("MATERIAL_ENABLE_TRANSMISSION");
3433
private static _thicknessMacro: ShaderMacro = ShaderMacro.getByName("MATERIAL_HAS_THICKNESS");
3534
private static _absorptionMacro: ShaderMacro = ShaderMacro.getByName("MATERIAL_HAS_ABSORPTION");
3635
private static _thicknessTextureMacro: ShaderMacro = ShaderMacro.getByName("MATERIAL_HAS_THICKNESS_TEXTURE");
@@ -459,6 +458,7 @@ export class PBRMaterial extends PBRBaseMaterial {
459458
shaderData.setVector4(PBRMaterial._iridescenceInfoProp, new Vector4(0, 1.3, 100, 400));
460459
const sheenColor = new Color(0, 0, 0);
461460
shaderData.setColor(PBRMaterial._sheenColorProp, sheenColor);
461+
this.refractionMode = RefractionMode.Plane;
462462
shaderData.setFloat(PBRMaterial._transmissionProp, 0);
463463
shaderData.setFloat(PBRMaterial._thicknessProp, 0);
464464
shaderData.setFloat(PBRMaterial._attenuationDistanceProp, Infinity);
@@ -509,19 +509,13 @@ export class PBRMaterial extends PBRBaseMaterial {
509509

510510
private _setRefractionMode(refractionMode: RefractionMode): void {
511511
switch (refractionMode) {
512-
case RefractionMode.None:
513-
this.shaderData.disableMacro(PBRMaterial._refractionMacro);
514-
break;
515512
case RefractionMode.Sphere:
516-
this.shaderData.enableMacro(PBRMaterial._refractionMacro);
517513
this.shaderData.enableMacro("REFRACTION_MODE", "SPHERE");
518514
break;
519515
case RefractionMode.Plane:
520-
this.shaderData.enableMacro(PBRMaterial._refractionMacro);
521516
this.shaderData.enableMacro("REFRACTION_MODE", "PLANE");
522517
break;
523518
case RefractionMode.Thin:
524-
this.shaderData.enableMacro(PBRMaterial._refractionMacro);
525519
this.shaderData.enableMacro("REFRACTION_MODE", "THIN");
526520
break;
527521
}

packages/core/src/material/enums/Refraction.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
* Refraction mode.
33
*/
44
export enum RefractionMode {
5-
/** No refraction. */
6-
None,
75
/** Refraction shape is sphere. */
86
Sphere,
97
/** Refraction shape is plane. */

packages/loader/src/gltf/extensions/KHR_materials_transmission.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { PBRMaterial, Texture2D, RefractionMode } from "@galacean/engine-core";
1+
import { PBRMaterial, Texture2D } from "@galacean/engine-core";
22
import { GLTFMaterialParser } from "../parser/GLTFMaterialParser";
33
import { registerGLTFExtension } from "../parser/GLTFParser";
44
import { GLTFParserContext, GLTFParserType } from "../parser/GLTFParserContext";
@@ -8,7 +8,6 @@ import { IKHRMaterialsTransmission } from "./GLTFExtensionSchema";
88
class KHR_materials_transmission extends GLTFExtensionParser {
99
override additiveParse(context: GLTFParserContext, material: PBRMaterial, schema: IKHRMaterialsTransmission): void {
1010
const { transmissionFactor = 0, transmissionTexture } = schema;
11-
material.refractionMode = RefractionMode.Plane;
1211
material.transmission = transmissionFactor;
1312

1413
if (transmissionTexture) {

packages/loader/src/gltf/extensions/KHR_materials_volume.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { PBRMaterial, Texture2D, RefractionMode } from "@galacean/engine-core";
1+
import { PBRMaterial, Texture2D } from "@galacean/engine-core";
22
import { Color } from "@galacean/engine-math";
33
import { GLTFMaterialParser } from "../parser/GLTFMaterialParser";
44
import { registerGLTFExtension } from "../parser/GLTFParser";
@@ -10,7 +10,6 @@ import { IKHRMaterialsVolume } from "./GLTFExtensionSchema";
1010
class KHR_materials_volume extends GLTFExtensionParser {
1111
override additiveParse(context: GLTFParserContext, material: PBRMaterial, schema: IKHRMaterialsVolume): void {
1212
const { thicknessFactor = 0, thicknessTexture, attenuationDistance = Infinity, attenuationColor } = schema;
13-
material.refractionMode = RefractionMode.Plane;
1413
material.thickness = thicknessFactor;
1514
material.attenuationDistance = attenuationDistance;
1615

0 commit comments

Comments
 (0)