diff options
-rw-r--r-- | examples/qt3d/pbr-materials/main.qml | 14 | ||||
-rw-r--r-- | src/quick3d/imports/extras/plugins.qmltypes | 16 |
2 files changed, 7 insertions, 23 deletions
diff --git a/examples/qt3d/pbr-materials/main.qml b/examples/qt3d/pbr-materials/main.qml index 301a113b5..0b69b5659 100644 --- a/examples/qt3d/pbr-materials/main.qml +++ b/examples/qt3d/pbr-materials/main.qml @@ -52,7 +52,7 @@ import QtQuick 2.1 import Qt3D.Core 2.0 import Qt3D.Render 2.9 import Qt3D.Input 2.0 -import Qt3D.Extras 2.9 +import Qt3D.Extras 2.15 Entity { id: root @@ -117,7 +117,7 @@ Entity { Mesh { source: "assets/obj/plane-10x10.obj" }, - TexturedMetalRoughMaterial { + MetalRoughMaterial { baseColor: TextureLoader { source: "assets/textures/ceramic_small_diamond/ceramic_small_diamond_basecolor.png" format: Texture.SRGB8_Alpha8 @@ -177,7 +177,7 @@ Entity { rotationY: -90 } - TexturedMetalRoughMaterial { + MetalRoughMaterial { id: matSphere1Material baseColor: TextureLoader { source: "assets/textures/aluminium_random_brushed/aluminium_random_brushed_basecolor.png" @@ -206,7 +206,7 @@ Entity { rotationY: -90 } - TexturedMetalRoughMaterial { + MetalRoughMaterial { id: matSphere2Material baseColor: TextureLoader { source: "assets/textures/american_walnut_crown_cut/american_walnut_crown_cut_basecolor.png" @@ -235,7 +235,7 @@ Entity { rotationY: -90 } - TexturedMetalRoughMaterial { + MetalRoughMaterial { id: matSphere3Material baseColor: TextureLoader { source: "assets/textures/ceramic_tiles_brown_tomato/ceramic_tiles_brown_tomato_basecolor.png" @@ -264,7 +264,7 @@ Entity { rotationY: -90 } - TexturedMetalRoughMaterial { + MetalRoughMaterial { id: matSphere4Material baseColor: TextureLoader { source: "assets/textures/copper_brushed/copper_brushed_basecolor.png" @@ -293,7 +293,7 @@ Entity { rotationY: -90 } - TexturedMetalRoughMaterial { + MetalRoughMaterial { id: matSphere5Material baseColor: TextureLoader { source: "assets/textures/gold_leaf_waste/gold_leaf_waste_basecolor.png" diff --git a/src/quick3d/imports/extras/plugins.qmltypes b/src/quick3d/imports/extras/plugins.qmltypes index a4e5d4503..f0fef23c2 100644 --- a/src/quick3d/imports/extras/plugins.qmltypes +++ b/src/quick3d/imports/extras/plugins.qmltypes @@ -1790,22 +1790,6 @@ Module { } } Component { - name: "Qt3DExtras::QTexturedMetalRoughMaterial" - prototype: "Qt3DExtras::QMetalRoughMaterial" - exports: ["Qt3D.Extras/TexturedMetalRoughMaterial 2.9"] - exportMetaObjectRevisions: [0] - Property { name: "ambientOcclusion"; type: "QVariant" } - Property { name: "normal"; type: "QVariant" } - Signal { - name: "ambientOcclusionChanged" - Parameter { name: "ambientOcclusion"; type: "QVariant" } - } - Signal { - name: "normalChanged" - Parameter { name: "normal"; type: "QVariant" } - } - } - Component { name: "Qt3DExtras::QTorusGeometry" prototype: "Qt3DRender::QGeometry" exports: ["Qt3D.Extras/TorusGeometry 2.0"] |