diff --git a/frontend/editor3d/app/components/reusable/ButtonIconSelect/ButtonIconSelect.tsx b/frontend/editor3d/app/components/reusable/ButtonIconSelect/ButtonIconSelect.tsx index c028cecf48..50cab79f46 100644 --- a/frontend/editor3d/app/components/reusable/ButtonIconSelect/ButtonIconSelect.tsx +++ b/frontend/editor3d/app/components/reusable/ButtonIconSelect/ButtonIconSelect.tsx @@ -38,7 +38,7 @@ export function ButtonIconSelect({ `flex h-8 items-center justify-center rounded-lg border text-sm transition-all duration-150`, text ? "h-auto w-auto gap-2 px-2.5 py-1" : "w-8", selectedOption === value - ? "border-brand-primary bg-ui-panel/[0.3]" + ? "border-brand-primary bg-brand-primary/20" : "border-transparent hover:bg-ui-panel/[0.4]", )} onClick={() => handleOptionChange(value)} diff --git a/frontend/editor3d/app/components/reusable/InputVector/InputVector.tsx b/frontend/editor3d/app/components/reusable/InputVector/InputVector.tsx index 357a4eaa28..8758030a63 100644 --- a/frontend/editor3d/app/components/reusable/InputVector/InputVector.tsx +++ b/frontend/editor3d/app/components/reusable/InputVector/InputVector.tsx @@ -39,7 +39,7 @@ export const InputVector = ({ oldZ.current = z; const inputCommonClasses = - "relative h-6 rounded-r-lg bg-brand-secondary-900/35 p-2 text-sm text-white transition-all duration-100 ease-in-out outline-none -outline-offset-2 text-end w-full hover:cursor-e-resize hover:bg-brand-secondary-900"; + "relative h-6 rounded-r-lg bg-black/25 p-2 text-sm text-white transition-all duration-100 ease-in-out outline-none -outline-offset-2 text-end w-full hover:cursor-e-resize hover:bg-black/40"; const wrapperCommonClasses = "relative flex items-center before:inline-block before:h-6 before:bg-brand-primary before:text-white before:rounded-l-lg before:w-1.5 before:text-center before:justify-center before:items-center before:font-semibold before:flex before:align-middle before:leading-8 text-xs"; diff --git a/frontend/editor3d/app/components/signaled/TopBar/TopBar.tsx b/frontend/editor3d/app/components/signaled/TopBar/TopBar.tsx index 050870048e..19a3c42b16 100644 --- a/frontend/editor3d/app/components/signaled/TopBar/TopBar.tsx +++ b/frontend/editor3d/app/components/signaled/TopBar/TopBar.tsx @@ -59,7 +59,7 @@ export const TopBar = ({ pageName }: Props) => { icon={faImages} onClick={() => setIsLibraryModalOpen(true)} > - My Library + My Gallery diff --git a/frontend/editor3d/app/pages/PageEnigma/PageEditor.tsx b/frontend/editor3d/app/pages/PageEnigma/PageEditor.tsx index b7d1538aaa..53fc2c80db 100644 --- a/frontend/editor3d/app/pages/PageEnigma/PageEditor.tsx +++ b/frontend/editor3d/app/pages/PageEnigma/PageEditor.tsx @@ -120,10 +120,7 @@ export const PageEditor = () => {
diff --git a/frontend/editor3d/app/pages/PageEnigma/comps/ControlPanelSceneObject/ControlPanelSceneObject.tsx b/frontend/editor3d/app/pages/PageEnigma/comps/ControlPanelSceneObject/ControlPanelSceneObject.tsx index 6dcbf17e48..fdad452469 100644 --- a/frontend/editor3d/app/pages/PageEnigma/comps/ControlPanelSceneObject/ControlPanelSceneObject.tsx +++ b/frontend/editor3d/app/pages/PageEnigma/comps/ControlPanelSceneObject/ControlPanelSceneObject.tsx @@ -15,11 +15,6 @@ import { } from "../../signals"; import { EngineContext } from "~/pages/PageEnigma/contexts/EngineContext"; import { Button, H5, InputVector } from "~/components"; - -import { QueueNames } from "../../Queue/QueueNames"; -import Queue from "~/pages/PageEnigma/Queue/Queue"; -import { toTimelineActions } from "../../Queue/toTimelineActions"; -import { QueueKeyframe } from "~/pages/PageEnigma/models"; import { editorState } from "~/pages/PageEnigma/signals/engine"; import { twMerge } from "tailwind-merge"; import { EditorStates } from "~/pages/PageEnigma/enums"; @@ -71,9 +66,6 @@ export const ControlPanelSceneObject = () => { }; const currentSceneObject = currentObject.value; - const position = currentSceneObject?.objectVectors?.position; - const rotation = currentSceneObject?.objectVectors?.rotation; - const scale = currentSceneObject?.objectVectors?.scale; function localToEngine(xyz: Record) { return { @@ -167,42 +159,6 @@ export const ControlPanelSceneObject = () => { setLocalScale(xyz); }; - const handleOnAddKeyFrame = () => { - if (currentSceneObject) { - if ( - position == null || - rotation == null || - scale == null || - currentSceneObject == null - ) { - return; - } - - for (const key in editorEngine?.timeline.characters) { - const element = editorEngine?.timeline.characters[key]; - if (key == currentSceneObject.object_uuid) { - currentSceneObject.group = element; - break; - } - } - - Queue.publish({ - queueName: QueueNames.TO_TIMELINE, - action: toTimelineActions.ADD_KEYFRAME, - data: { - group: currentSceneObject.group, - object_uuid: currentSceneObject.object_uuid, - object_name: currentSceneObject.object_name, - version: 1, - - position: currentSceneObject.objectVectors.position, - rotation: currentSceneObject.objectVectors.rotation, - scale: currentSceneObject.objectVectors.scale, - } as QueueKeyframe, - }); - } - }; - const handleDeleteObject = () => { editorEngine?.deleteObject(currentSceneObject.object_uuid); }; @@ -216,7 +172,7 @@ export const ControlPanelSceneObject = () => { {
- + */}
); diff --git a/frontend/editor3d/app/pages/PageEnigma/comps/LibraryModal/LibraryModal.tsx b/frontend/editor3d/app/pages/PageEnigma/comps/LibraryModal/LibraryModal.tsx index 126db4543d..295ab5a31e 100644 --- a/frontend/editor3d/app/pages/PageEnigma/comps/LibraryModal/LibraryModal.tsx +++ b/frontend/editor3d/app/pages/PageEnigma/comps/LibraryModal/LibraryModal.tsx @@ -159,7 +159,7 @@ export const LibraryModal = ({

- {mode === "select" ? "Select Images" : "My Library"} + {mode === "select" ? "Select Images" : "My Gallery"}