diff --git a/src/widgets/3dview/SceneEntity.qml b/src/widgets/3dview/SceneEntity.qml index 941f0d6..5832399 100644 --- a/src/widgets/3dview/SceneEntity.qml +++ b/src/widgets/3dview/SceneEntity.qml @@ -1,82 +1,71 @@ import QtQuick 2.7 import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Input 2.0 import Qt3D.Extras 2.0 import GridMesh 1.0 import LineMesh 1.0 Entity { id: sceneRoot property string currentFile Camera { id: camera projectionType: CameraLens.PerspectiveProjection fieldOfView: 45 aspectRatio: 16/9 nearPlane : 0.01 farPlane : 1000.0 position: Qt.vector3d( 10.0, -10.0, 35.0 ) upVector: Qt.vector3d( 0.0, 0.85, 0.75 ) viewCenter: Qt.vector3d( 10.0, 10.0, 0.0 ) } FirstPersonCameraController { camera: camera } components: [ RenderSettings { activeFrameGraph: ClearBuffers { buffers: ClearBuffers.ColorDepthBuffer clearColor: "transparent" RenderSurfaceSelector { id: surfaceSelector ClearBuffers { buffers : ClearBuffers.ColorDepthBuffer NoDraw {} } Viewport { id: topLeftViewport CameraSelector { id: cameraSelectorTopLeftViewport camera: camera } } } } }, InputSettings { } ] - GridMesh { - id: gridMesh - } - - LineMesh { - id: lineMesh - readonly property string currentFile: sceneRoot.currentFile - onCurrentFileChanged: readAndRun(currentFile) - } - - PhongMaterial { - id: material - ambient: "darkBlue" - } - - PhongMaterial { - id: lineMaterial - ambient: "darkGreen" - } - Entity { id: gridEntity - components: [ gridMesh, material ] + components: [ + PhongMaterial { ambient: "darkBlue" }, + GridMesh {} + ] } Entity { id: lineEntity - components: [ lineMesh, lineMaterial ] + components: [ + PhongMaterial { ambient: "darkGreen" }, + LineMesh { + readonly property string currentFile: sceneRoot.currentFile + onCurrentFileChanged: readAndRun(currentFile) + } + ] } }