Skip to content

Commit 4e48be0

Browse files
romankohoRoman
andauthored
fix: add renderOrder to AxisRotator (#2504)
* add renderOrder to AxisRotator * add renderOrder property to PivotControls (defaults to 500) --------- Co-authored-by: Roman <[email protected]>
1 parent 1b933d5 commit 4e48be0

File tree

6 files changed

+12
-2
lines changed

6 files changed

+12
-2
lines changed

docs/gizmos/pivot-controls.mdx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ type PivotControlsProps = {
5959
onDragEnd?: () => void
6060
/** Set this to false if you want the gizmo to be visible through faces */
6161
depthTest?: boolean
62+
/** Render order of pivot control - default is 500 */
63+
renderOrder?: number
6264
opacity?: number
6365
visible?: boolean
6466
userData?: { [key: string]: any }

src/web/pivotControls/AxisArrow.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export const AxisArrow: React.FC<{ direction: THREE.Vector3; axis: 0 | 1 | 2 }>
5252
axisColors,
5353
hoveredColor,
5454
opacity,
55+
renderOrder,
5556
onDragStart,
5657
onDrag,
5758
onDragEnd,
@@ -189,7 +190,7 @@ export const AxisArrow: React.FC<{ direction: THREE.Vector3; axis: 0 | 1 | 2 }>
189190
polygonOffsetFactor={-10}
190191
fog={false}
191192
/>
192-
<mesh raycast={() => null} position={[0, cylinderLength + coneLength / 2.0, 0]} renderOrder={500}>
193+
<mesh raycast={() => null} position={[0, cylinderLength + coneLength / 2.0, 0]} renderOrder={renderOrder}>
193194
<coneGeometry args={[coneWidth, coneLength, 24, 1]} />
194195
<meshBasicMaterial
195196
transparent

src/web/pivotControls/AxisRotator.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ export const AxisRotator: React.FC<{ dir1: THREE.Vector3; dir2: THREE.Vector3; a
7272
fixed,
7373
axisColors,
7474
hoveredColor,
75+
renderOrder,
7576
opacity,
7677
onDragStart,
7778
onDrag,
@@ -239,6 +240,7 @@ export const AxisRotator: React.FC<{ dir1: THREE.Vector3; dir2: THREE.Vector3; a
239240
opacity={opacity}
240241
polygonOffset
241242
polygonOffsetFactor={-10}
243+
renderOrder={renderOrder}
242244
fog={false}
243245
/>
244246
</group>

src/web/pivotControls/ScalingSphere.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ export const ScalingSphere: React.FC<{ direction: THREE.Vector3; axis: 0 | 1 | 2
5353
axisColors,
5454
hoveredColor,
5555
opacity,
56+
renderOrder,
5657
onDragStart,
5758
onDrag,
5859
onDragEnd,
@@ -196,7 +197,7 @@ export const ScalingSphere: React.FC<{ direction: THREE.Vector3; axis: 0 | 1 | 2
196197
/>
197198
</Html>
198199
)}
199-
<mesh ref={meshRef} position={[0, position, 0]} renderOrder={500} userData={userData}>
200+
<mesh ref={meshRef} position={[0, position, 0]} renderOrder={renderOrder} userData={userData}>
200201
<sphereGeometry args={[radius, 12, 12]} />
201202
<meshBasicMaterial
202203
transparent

src/web/pivotControls/context.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export type PivotContext = {
2323
lineWidth: number
2424
fixed: boolean
2525
depthTest: boolean
26+
renderOrder: number
2627
userData?: { [key: string]: any }
2728
annotations?: boolean
2829
annotationsClass?: string

src/web/pivotControls/index.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ export type PivotControlsProps = {
8282
onDragEnd?: () => void
8383
/** Set this to false if you want the gizmo to be visible through faces */
8484
depthTest?: boolean
85+
renderOrder?: number
8586
opacity?: number
8687
visible?: boolean
8788
userData?: { [key: string]: any }
@@ -115,6 +116,7 @@ export const PivotControls: ForwardRefComponent<PivotControlsProps, THREE.Group>
115116
rotationLimits,
116117
scaleLimits,
117118
depthTest = true,
119+
renderOrder = 500,
118120
axisColors = ['#ff2060', '#20df80', '#2080ff'],
119121
hoveredColor = '#ffff40',
120122
annotations = false,
@@ -197,6 +199,7 @@ export const PivotControls: ForwardRefComponent<PivotControlsProps, THREE.Group>
197199
lineWidth,
198200
fixed,
199201
depthTest,
202+
renderOrder,
200203
userData,
201204
annotations,
202205
annotationsClass,

0 commit comments

Comments
 (0)