From 038366448c1c6a6e4c0a06cbc9a99aee11254e3b Mon Sep 17 00:00:00 2001 From: ad044 Date: Tue, 15 Sep 2020 18:15:58 +0400 Subject: [PATCH] debug for mr jtoek --- public/models/ring2.glb | Bin 0 -> 4836 bytes src/components/MiddleRing/MiddleRing.tsx | 26 ++++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 public/models/ring2.glb diff --git a/public/models/ring2.glb b/public/models/ring2.glb new file mode 100644 index 0000000000000000000000000000000000000000..4a14450e60aa21fd8c724bfb415c18ebe47e0f12 GIT binary patch literal 4836 zcmb7|OKe=KcWhDBc9BQm{EncXz1tybJNN}I-N+=!EEyO|gziYWf?e=kBX4ZPNvqauz}POB##Y{FEhB(YGJDiAN>?_GMs*E3 zV?piZjYe}N=7yQKu5Df0dG8xez&@!We9~-J+baGQv*5a(>zJk+IDr!uEkAD-ik1^V z=Z9thz2*7&<7NSyrt4clvFQ4~AA}AJJ<~Bm%k(VEa&4~|B5OOTHd^&Gyi+h8$9Fs* zu7PRV%FDLBz%|`4H1V{pz|C6)%L+Wl_WYu4`LrS%&(;^bm2 z{+*7|0hUTMcOabvZOduCZa21!lj#trq|nmgV9AJ+8$ z7zaNQM`4sPd9u{rQ%P z^W(n`mC3XxvnJZ3M$S;_$$Bom2G&G-)EJQ&hs@m6qn2$l^<8v^r0RxI%I0e$ffjm zx_Om8W!iIQw4ptjcb$5C2N9WiGS^;SRRiDIH@_L`@eM^}YRPH8$i?_&>dCy*w8tHf z$kdbRLp@@Y$<&k6+^9t{ZO9ZdzgIHt$-KMN<1X_XRPo8oO+9-h)1J)S)T0)DgDNkX zcaeJB5yiA8@4nFe7Jl`&s~w$xG}XPUAO7~Gj?QoWu=`DgcSa+fU)Caq< zv90sp|JeO@4!rg1w$AjYeJ@U*kxOxSSLN+9>!3Yr(V6{F&z}AVcQn238)jA%=NS2Y`Z<)QTBb-bLp(ju&gs|)Ev0#tet73GiIW4p)Ss+ z&;NR_d&h>uePx|7D;2*t|32%vbjEqByNwznoiQtwt9MWO%x{wCh`-x9vpy?-+foboZI)aZJn8q_B<<{sq6kd_`AgWN)s zRbwx&>M3QdHlCNV=ghPo8NW<>o{u&Y-m7#zkv3=EPn8ex%GyjGVC{@pvx?8&wR7k9 zqT=(;YIkE>XPlGDg5kLx3l5fJJ1TkeyPQYUfQk1ep@F+t(IVq=LbrMpNahZVC zIAlyFY%aD1wD%a4>RY)M$<#~8qhb-b$ icfn&fuC literal 0 HcmV?d00001 diff --git a/src/components/MiddleRing/MiddleRing.tsx b/src/components/MiddleRing/MiddleRing.tsx index 9c6ef62..6cd52a0 100644 --- a/src/components/MiddleRing/MiddleRing.tsx +++ b/src/components/MiddleRing/MiddleRing.tsx @@ -151,6 +151,25 @@ const MiddleRing = memo(() => { } `; + const testVertex = ` + varying vec2 vUv; + + void main() { + vUv = uv; + + // compute world position of the vertex + // (ie, position after model rotation and translation) + vec3 worldPos = modelMatrix * vec3(position, 1.0f); + + // use the world position to move the original point up or down + vec3 pos = position; + pos.y += 3.5 * sin(0.3 * worldPos.x) * sin(0.3 * worldPos.z); + + // transform this position into final viewspace + gl_Position = projectionMatrix * modelViewMatrix * vec4(pos, 1.); + } +` + const fragmentShader = ` uniform sampler2D tex; @@ -168,7 +187,7 @@ const MiddleRing = memo(() => { if (middleRingMaterialRef.current) { middleRingMaterialRef.current.uniforms.uTime.value = clock.getElapsedTime(); } - middleRingRef.current!.rotation.y += 0.06; + // middleRingRef.current!.rotation.y += 0.06; }); // -0.15, 03 @@ -178,15 +197,16 @@ const MiddleRing = memo(() => { material={materials["Material.001"]} geometry={nodes.BezierCircle.geometry} position={[0, -0.15, 0.3]} - scale={[0.8, 0.5, 0.8]} + scale={[0.8, 0.7, 0.8]} ref={middleRingRef} + rotation={[0, -0.9, 0]} >