@@ -249,7 +258,7 @@ const Product = () => {
)
: (
-
+
)
diff --git a/src/covisart/Simulator.js b/src/covisart/Simulator.js
index 32819e3..742d90b 100644
--- a/src/covisart/Simulator.js
+++ b/src/covisart/Simulator.js
@@ -1,6 +1,6 @@
import { useRef, Suspense } from 'react'
-import { Canvas, useFrame } from '@react-three/fiber'
-import { useGLTF, Stage, Grid, OrbitControls, Html, MeshDistortMaterial, MeshDiscardMaterial, useProgress } from '@react-three/drei'
+import { Canvas, useThree } from '@react-three/fiber'
+import { useGLTF, Stage, Grid, OrbitControls, Html, ContactShadows, MeshDiscardMaterial, useProgress } from '@react-three/drei'
import { EffectComposer, Bloom } from '@react-three/postprocessing'
import { Model } from './models/NGS_GLT_V2'
import { Ngs_GLT } from './models/NGS_GLT'
@@ -14,21 +14,21 @@ function Loader() {
export default function Simulator() {
const { ruler } = useControls({ "ruler": false })
state.ruler = ruler
+
return (
)
-}
-
-/*
-Auto-generated by: https://github.com/pmndrs/gltfjsx
-Command: npx gltfjsx@6.1.0 s2wt_kamdo_industrial_divinities.glb --transform --simplify
-Author: Hansalex (https://sketchfab.com/Hansalex)
-License: CC-BY-4.0 (http://creativecommons.org/licenses/by/4.0/)
-Source: https://sketchfab.com/3d-models/s2wt-kamdo-industrial-divinities-f503b70ac05e49a38c81100d71599a1b
-Title: S2WT "Kamdo" (Industrial Divinities)
-*/
-
-function Kamdo({ url, ...props }) {
- const head = useRef()
- const { nodes, materials } = useGLTF('/s2wt_kamdo_industrial_divinities-transformed.glb')
-
- return (
-
-
-
-
-
-
-
- {
- //
- }
-
- )
-}
-
-useGLTF.preload('/s2wt_kamdo_industrial_divinities-transformed.glb')
+}
\ No newline at end of file
diff --git a/src/covisart/models/NGS_GLT.jsx b/src/covisart/models/NGS_GLT.jsx
index e8796a2..8fc8782 100644
--- a/src/covisart/models/NGS_GLT.jsx
+++ b/src/covisart/models/NGS_GLT.jsx
@@ -5,7 +5,7 @@ Files: NGS_GLT_V2.glb [117.38MB] > NGS_GLT_V2-transformed.glb [11.95MB] (90%)
*/
import React, { useRef, useLayoutEffect } from 'react'
-import { useGLTF, useAnimations } from '@react-three/drei'
+import { useGLTF } from '@react-three/drei'
import { useFrame, applyProps } from '@react-three/fiber'
import { useSnapshot } from 'valtio'
import { easing } from 'maath'
@@ -15,35 +15,33 @@ export function Ngs_GLT({ url, ...props }) {
const axis2 = useRef()
const axis1 = useRef()
const snap = useSnapshot(control)
- const { nodes, materials, animations } = useGLTF(url)
- const { actions } = useAnimations(animations, axis3)
+ const { nodes, materials } = useGLTF(url)
+ easing.dampC(materials.Metal.color, snap.color, 0.0, 0)
+
useFrame((state, delta) => {
- easing.dampC(materials.Metal.color, snap.color, 0.0, delta)
- })
- /*useFrame((state, delta) => {
- const t = Math.sin(state.clock.elapsedTime)
- easing.dampE(axis3.current.rotation, [t, 0, 0], control.speed, delta)
- easing.dampE(axis2.current.rotation, [0, t, 0], control.speed, delta)
- easing.dampE(axis1.current.rotation, [t, 0, 0], control.speed, delta)
+ const t = Math.sin(state.clock.elapsedTime) //map(Math.sin(state.clock.elapsedTime), -45, 45, -360, 360)
+ easing.dampE(axis3.current.rotation, [t, 0, 0], control.speed, delta/2)
+ easing.dampE(axis2.current.rotation, [0, t, 0], control.speed, delta/2)
+ easing.dampE(axis1.current.rotation, [t, 0, 0], control.speed, delta/2)
})
useLayoutEffect(() => {
Object.values(nodes).forEach((node) => node.isMesh &&
(node.receiveShadow = node.castShadow = true,
applyProps(node.material, { roughness: 1.0, roughnessMap: null, normalScale: [4, 4] })))
- }, [nodes, materials])*/
+ }, [nodes, materials])
return (
-
-
+
+
-
-
-
-
+
+
+
+
-
-
+
+
-
+
{
@@ -60,49 +58,54 @@ export function Ngs_GLT({ url, ...props }) {
}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{
nodes[snap.motor] != null &&
-
+
}
-
-
-
-
-
-
+
+
+
+
+
+
-
)
}
-
-useGLTF.preload('/NGS_GLT_V2-transformed.glb')
+export function clamp(input, min, max) {
+ return input < min ? min : input > max ? max : input;
+}
+export function map(current, in_min, in_max, out_min, out_max) {
+ const mapped= ((current - in_min) * (out_max - out_min)) / (in_max - in_min) + out_min;
+ return clamp(mapped, out_min, out_max);
+}
+useGLTF.preload('/covisart/models/NGS_GLT_V2-transformed.glb')
diff --git a/src/covisart/store.js b/src/covisart/store.js
index a68aa68..f7113f1 100644
--- a/src/covisart/store.js
+++ b/src/covisart/store.js
@@ -13,7 +13,7 @@ const state = proxy({
accessory:'JustSim',
colors: ['grey','black', 'blue', 'goldenrod', 'azure', 'lightslategray' ],
decals: ['react', 'three2', 'pmndrs'],
- color: 'grey',
+ color: 'black',
led: '#FF0000',
decal: 'three2',
motors: ['BECKHOFF_AM8552', 'BECKHOFF_AM8052'],