Merge remote-tracking branch 'origin/alpha-sarme' into sarme

mini-mirana · Sep 10, 2022 · 19354ab · 19354ab
2 parents a15ced8 + b944b56
commit 19354ab
Show file tree

Hide file tree

Showing 5 changed files with 184 additions and 56 deletions.
diff --git a/src/components/BackGrid/index.jsx b/src/components/BackGrid/index.jsx
@@ -16,7 +16,8 @@ export function BackGrid({ ...props }) {
     // </Plane>
     <Float scale={0.75} rotationIntensity={0.01} floatIntensity={1} speed={3}>
       <mesh {...props}>
-        <cylinderGeometry args={[5, 5, 500, 54, 64, true, 0, 6.283185307179586]} />
+        {/* <cylinderGeometry args={[5, 5, 500, 54, 64, true, 0, 6.283185307179586]} /> */}
+        <coneGeometry args={[7, 400, 7, 100, false, 0, 6.283185307179586]} />
         <meshStandardMaterial color='#2ec4b6' wireframe side={THREE.DoubleSide} />
       </mesh>
     </Float>

diff --git a/src/components/Loader/index.jsx b/src/components/Loader/index.jsx
@@ -97,7 +97,7 @@ export function Loader({
                   <ArwesText className='ml-[1%] text-center'>
                     Tap anywhere to start <br />{' '}
                     <span className='text-xs font-semibold inline-block py-1 px-2 uppercase rounded-full text-blue-600 bg-blue-200 uppercase last:mr-0 mr-1'>
-                      PRO TIP
+                      PRO-TIP
                     </span>{' '}
                     Pinch or pan to move through channel
                   </ArwesText>

diff --git a/src/components/TextMesh/index.jsx b/src/components/TextMesh/index.jsx
@@ -1,8 +1,9 @@
+import * as THREE from 'three' /* three/examples/fonts/helvetiker_bold.typeface.json */
 import { useLayoutEffect, useRef } from 'react'
 import { Vector3 } from 'three'
 import { FontLoader, TextGeometry } from 'three-stdlib'
 import { extend } from '@react-three/fiber'
-import defaultFont from '../../assets/NoirPro-Bold.json' /* three/examples/fonts/helvetiker_bold.typeface.json */
+import defaultFont from '../../assets/NoirPro-Bold.json'
 
 extend({ TextGeometry })
 
@@ -13,12 +14,12 @@ export function TextMesh({
   fontConfig = {
     size: 100,
     height: 0.1,
-    curveSegments: 32,
+    curveSegments: 1,
     bevelEnabled: true,
-    bevelThickness: 1,
-    bevelSize: 1,
-    bevelOffset: 0,
-    bevelSegments: 2
+    bevelThickness: 2,
+    bevelSize: 10,
+    bevelOffset: -10,
+    bevelSegments: 0.001
   },
   vAlign = 'center',
   hAlign = 'center',
@@ -53,7 +54,7 @@ export function TextMesh({
             e.center()
           }}
         />
-        <meshNormalMaterial />
+        <meshNormalMaterial wireframe side={THREE.DoubleSide} />
       </mesh>
     </group>
   )

diff --git a/src/pages/index.js b/src/pages/index.js
@@ -471,9 +471,9 @@ function Page({ startZ, distance }) {
               type: 'photo-text',
               photoY: 0,
               source: 'https://cdn1.sarme.cyou/cdn/smart-reporting-single.png',
-              title: 'Lead Fullstack Developer Ahmadi Roshan \nShiraz, Iran',
-              description: ` 2019 \n\n﫟 Deep packet inspection for industrial network
-              \n\n﫟 SaaS structured reporting web application
+              title: 'Head Fullstack Developer Ahmadi Roshan \nIran',
+              description: ` 2019 \n\n﫟 Structured reporting web application and SaaS
+              \n\n﫟 Specialized speech recognition for medical report
               \n\n﫟 Continuous deployment using Gitlab CI/CD
               \n\n﫟 Linux server administration`,
               descriptionFont:
@@ -641,13 +641,13 @@ export default function Home() {
     if (measure < thr) {
       scrollInSound.current.play()
       set.start(() => ({
-        pos: [0, 0, from - 1],
+        pos: [0, 0, from - 2],
         rotation: [cam.current.rotation.x, cam.current.rotation.y, r]
       }))
     } else {
       scrollOutSound.current.play()
       set.start(() => ({
-        pos: [0, 0, from + 1],
+        pos: [0, 0, from + 2],
         rotation: [cam.current.rotation.x, cam.current.rotation.y, r]
       }))
     }