Skip to content

Commit f11459c

Browse files
committed
remove clip
1 parent 455ad61 commit f11459c

File tree

3 files changed

+10
-20
lines changed

3 files changed

+10
-20
lines changed

packages/visionOS/web-spatial/model/Spatialized2DElement.swift

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Spatialized2DElement: SpatializedElement, ScrollAbleSpatialElementContaine
99
var backgroundMaterial = BackgroundMaterial.None
1010

1111
var scrollPageEnabled = false
12-
12+
1313
var scrollEdgeInsetsMarginRight: CGFloat? {
1414
get {
1515
return spatialWebViewModel.getController().webview?.scrollView.contentInset.right
@@ -46,16 +46,13 @@ class Spatialized2DElement: SpatializedElement, ScrollAbleSpatialElementContaine
4646
spatialWebViewModel = SpatialWebViewModel(url: nil)
4747

4848
super.init()
49-
50-
clip = false
5149

5250
spatialWebViewModel.setBackgroundTransparent(true)
5351
spatialWebViewModel.addScrollUpdateListener { _, point in
5452
self._scrollOffset.x = point.x
5553
self._scrollOffset.y = point.y
5654
}
5755
spatialWebViewModel.scrollEnabled = false
58-
5956
}
6057

6158
// Spatialized2DElement can hold a collection of SpatializedElement children
@@ -92,7 +89,7 @@ class Spatialized2DElement: SpatializedElement, ScrollAbleSpatialElementContaine
9289
func loadHtml(_ html: String) {
9390
spatialWebViewModel.loadHTML(html)
9491
}
95-
92+
9693
func load(_ url: String) {
9794
spatialWebViewModel.load(url)
9895
}

packages/visionOS/web-spatial/model/SpatializedElement.swift

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ class SpatializedElement: SpatialObject {
1616
var height: Double = 0.0
1717
var depth: Double = 0.0
1818
var backOffset: Double = 0.0
19-
var transform: AffineTransform3D = AffineTransform3D.identity
19+
var transform: AffineTransform3D = .identity
2020
var rotationAnchor: UnitPoint3D = .center
2121
var opacity: Double = 1.0
2222
var visible = true
2323
var scrollWithParent = true
2424
var zIndex: Double = 0
25-
25+
2626
// whether require clip action
27-
var clip = true
28-
27+
// var clip = true
28+
2929
var enableDragStartGesture: Bool = false
3030
var enableDragGesture: Bool = false
3131
var enableDragEndGesture: Bool = false
@@ -36,16 +36,13 @@ class SpatializedElement: SpatialObject {
3636
var enableMagnifyGesture: Bool = false
3737
var enableMagnifyEndGesture: Bool = false
3838
var enableTapGesture: Bool = false
39-
39+
4040
var enableGesture: Bool {
41-
get {
42-
return enableDragStartGesture || enableDragGesture || enableDragEndGesture || enableRotateStartGesture || enableRotateGesture || enableRotateEndGesture || enableMagnifyStartGesture || enableMagnifyGesture || enableMagnifyEndGesture || enableTapGesture
43-
}
41+
return enableDragStartGesture || enableDragGesture || enableDragEndGesture || enableRotateStartGesture || enableRotateGesture || enableRotateEndGesture || enableMagnifyStartGesture || enableMagnifyGesture || enableMagnifyEndGesture || enableTapGesture
4442
}
4543

46-
4744
enum CodingKeys: String, CodingKey {
48-
case clientX, clientY, width, height, depth, backOffset, transform, rotationAnchor, opacity, visible, scrollWithParent, zIndex, parent, enableGesture, enableTapGesture, enableDragGesture, enableDragEndGesture, enableRotateStartGesture, enableRotateGesture,enableRotateEndGesture,enableMagnifyStartGesture, enableMagnifyGesture, enableMagnifyEndGesture
45+
case clientX, clientY, width, height, depth, backOffset, transform, rotationAnchor, opacity, visible, scrollWithParent, zIndex, parent, enableGesture, enableTapGesture, enableDragGesture, enableDragEndGesture, enableRotateStartGesture, enableRotateGesture, enableRotateEndGesture, enableMagnifyStartGesture, enableMagnifyGesture, enableMagnifyEndGesture
4946
}
5047

5148
override func encode(to encoder: Encoder) throws {

packages/visionOS/web-spatial/view/SpatializedElementView.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ struct SpatializedElementView<Content: View>: View {
141141
let opacity = spatializedElement.opacity
142142
let visible = spatializedElement.visible
143143
let enableGesture = spatializedElement.enableGesture
144-
let clip = spatializedElement.clip
145144

146145
let z = translation.z + (spatializedElement.zIndex * zOrderBias)
147146
let smallOffset = z == 0.0 ? 0.0001 : 0
@@ -155,10 +154,7 @@ struct SpatializedElementView<Content: View>: View {
155154
return proxy.transform(in: .named("SpatialScene"))!
156155
} action: { _, new in
157156
spatialScene.sendWebMsg(spatializedElement.id, SpatiaizedContainerTransform(detail: new))
158-
}.if(clip, transform: { view in
159-
view.clipped()
160-
})
161-
157+
}
162158
.frame(depth: 0, alignment: .back)
163159
// use .offset(smallVal) to workaround for glassEffect not working and small width/height spatialDiv not working
164160
.offset(z: smallOffset)

0 commit comments

Comments
 (0)