Skip to content

Add materials prop to ARPlaneSelector for plane customization #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mrankkiiiii wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add materials prop to ARPlaneSelector for plane customization #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions components/AR/ViroARPlaneSelector.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
ViroClickStateEvent,
ViroPlaneUpdatedMap,
} from "../Types/ViroEvents";
import { ViroARPlaneType, ViroNativeRef } from "../Types/ViroUtils";
import { ViroARPlaneType, ViroNativeRef, ViroSource } from "../Types/ViroUtils";

type ViroARPlaneClassification =
| "None"
Expand Down Expand Up @@ -50,6 +50,7 @@ type Props = {
disableClickSelection?: boolean; // Disable click-based selection, only show planes visually
useActualShape?: boolean; // Use boundary vertices for accurate shape (default: true)
children?: React.ReactNode;
materials?: ViroSource[] | string | string[];
};

type State = {
Expand Down Expand Up @@ -80,6 +81,12 @@ export class ViroARPlaneSelector extends React.Component<Props, State> {
const arPlanes: React.JSX.Element[] = [];
const detectBothAlignments =
this.props.alignment === "Both" || !this.props.alignment;

// Since materials can be either a string or an array, convert the string to a 1-element array
const materials =
typeof this.props.materials === "string"
? new Array(this.props.materials)
: this.props.materials;

// Determine which alignments to detect
const alignmentsToDetect: Array<
Expand Down Expand Up @@ -172,7 +179,7 @@ export class ViroARPlaneSelector extends React.Component<Props, State> {
key={`polygon-${anchorId}`}
vertices={vertices2D!}
holes={[]}
materials={["ViroARPlaneSelector_Translucent"]}
materials={!!materials ? materials : ["ViroARPlaneSelector_Translucent"]}
{...(!this.props.disableClickSelection && {
onClickState: (clickState, position, source) =>
this._getOnClickSurface(anchorId, {
Expand All @@ -188,7 +195,7 @@ export class ViroARPlaneSelector extends React.Component<Props, State> {
) : (
<ViroQuad
key={`quad-${anchorId}`}
materials={["ViroARPlaneSelector_Translucent"]}
materials={!!materials ? materials : ["ViroARPlaneSelector_Translucent"]}
{...(!this.props.disableClickSelection && {
onClickState: (clickState, position, source) =>
this._getOnClickSurface(anchorId, {
Expand Down
3 changes: 2 additions & 1 deletion dist/components/AR/ViroARPlaneSelector.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* @providesModule ViroARPlaneSelector
*/
import { ViroClickStateEvent, ViroPlaneUpdatedMap } from "../Types/ViroEvents";
import { ViroARPlaneType, ViroNativeRef } from "../Types/ViroUtils";
import { ViroARPlaneType, ViroNativeRef, ViroSource } from "../Types/ViroUtils";
import * as React from "react";
type Props = {
minHeight?: number;
Expand All @@ -20,6 +20,7 @@ type Props = {
disableClickSelection?: boolean;
useActualShape?: boolean;
children?: React.ReactNode;
materials?: ViroSource[] | string | string[];
};
type State = {
selectedPlaneId: string | null;
Expand Down
9 changes: 7 additions & 2 deletions dist/components/AR/ViroARPlaneSelector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,11 @@ class ViroARPlaneSelector extends React.Component {
_getARPlanes() {
const arPlanes = [];
const detectBothAlignments = this.props.alignment === "Both" || !this.props.alignment;
// Since materials can be either a string or an array, convert the string to a 1-element array
const materials =
typeof this.props.materials === "string"
? new Array(this.props.materials)
: this.props.materials;
// Determine which alignments to detect
const alignmentsToDetect = [];
if (detectBothAlignments) {
Expand Down Expand Up @@ -132,13 +137,13 @@ class ViroARPlaneSelector extends React.Component {
vertices2D &&
vertices2D.length >= 3;
const finalOpacity = isSelected ? 0 : isVisible ? 1 : 0;
visualElement = useActualShape ? (<ViroPolygon_1.ViroPolygon key={`polygon-${anchorId}`} vertices={vertices2D} holes={[]} materials={["ViroARPlaneSelector_Translucent"]} {...(!this.props.disableClickSelection && {
visualElement = useActualShape ? (<ViroPolygon_1.ViroPolygon key={`polygon-${anchorId}`} vertices={vertices2D} holes={[]} materials={!!materials ? materials : ["ViroARPlaneSelector_Translucent"]} {...(!this.props.disableClickSelection && {
onClickState: (clickState, position, source) => this._getOnClickSurface(anchorId, {
clickState,
position,
source,
}),
})} position={[0, 0, 0]} rotation={polygonRotation} opacity={finalOpacity}/>) : (<ViroQuad_1.ViroQuad key={`quad-${anchorId}`} materials={["ViroARPlaneSelector_Translucent"]} {...(!this.props.disableClickSelection && {
})} position={[0, 0, 0]} rotation={polygonRotation} opacity={finalOpacity}/>) : (<ViroQuad_1.ViroQuad key={`quad-${anchorId}`} materials={!!materials ? materials : ["ViroARPlaneSelector_Translucent"]} {...(!this.props.disableClickSelection && {
onClickState: (clickState, position, source) => this._getOnClickSurface(anchorId, {
clickState,
position,
Expand Down