Merge pull request #27 from amarpersaud/master

Merge master changes into development branch
amarpersaud · May 25, 2024 · 9e1be01 · 9e1be01
2 parents 6ed7691 + 3ed40fe
commit 9e1be01
Show file tree

Hide file tree

Showing 13 changed files with 36 additions and 25 deletions.
diff --git a/CNAME b/CNAME
@@ -0,0 +1 @@
+amarpersaud.com
diff --git a/HTML_SRC/about.html b/HTML_SRC/about.html
@@ -19,13 +19,13 @@ <h1 class="page-header">About</h1>
         <h2 class="sub-header">Who am I?</h2>
         <div class="indentp indent l">
         <p>
-			I am a 23 year old university student who likes science, math, electronics and programming. 
-			I currently attend SUNY Stony Brook University, pursuing a degree in Electrical Engineering.
+			I am a 23 year old Electrical Engineer who likes science, math, electronics and programming. 
+			I graduated from SUNY Stony Brook University with a BS in Electrical Engineering.
 		</p>
 		<p>
 			I work on many personal projects, which can be viewed on my projects page. 
 			This includes electronics, involving creating, manufacturing and assembling custom PCBs, programming for a multitude of platforms such as embedded devices, webpages, websites, and desktop and mobile applications, as well as 3d modelling, CAD, and CAM for additive and subtractive machining (3d printing and CNC).
-		</p>
+		</p>		
         </div>
         <h2 class="sub-header">Contact</h2>
         <div class="indentp">

diff --git a/HTML_SRC/index.html b/HTML_SRC/index.html
@@ -15,7 +15,7 @@
       <div class="cover-container">
         <div class="box">
           <h1 class="covertag">Amar Persaud</h1>
-          <p class="coverside">Student, software developer, and Electrical Engineer</p>
+          <p class="coverside">Electrical Engineer and Software developer</p>
           <span class="coverbutton"><a class="button" href="/projects.html">Projects</a><a class="button" href="/about.html">About</a><a class="button" href="/documents/AmarPersaud_Resume.pdf">Resume</a></span>
         </div>
       </div>

diff --git a/about.html b/about.html
@@ -69,8 +69,8 @@ <h2 class="sub-header">
     </h2>
     <div class="indentp indent l">
      <p>
-      I am a 23 year old university student who likes science, math, electronics and programming. 
-			I currently attend SUNY Stony Brook University, pursuing a degree in Electrical Engineering.
+      I am a 23 year old Electrical Engineer who likes science, math, electronics and programming. 
+			I graduated from SUNY Stony Brook University with a BS in Electrical Engineering.
      </p>
      <p>
       I work on many personal projects, which can be viewed on my projects page. 
@@ -141,4 +141,4 @@ <h2 class="sub-header">
   <script src="js/js.min.js" type="text/javascript">
   </script>
  </body>
-</html>
+</html>
diff --git a/css/styles.css b/css/styles.css
@@ -1037,7 +1037,7 @@ x-alert>span>div>div{
 	position: fixed;
 	z-index: 1;
 	font-smooth: 2em;
-	transition: left 0.2s linear, top 0.2s linear;
+	transition: left 0.2s linear, top 0.2s linear, rotate 0.2s linear;
 }
 
 @media screen and (max-width: 760px) {

diff --git a/css/styles.min.css b/css/styles.min.css
diff --git a/documents/AmarPersaud_Resume.pdf b/documents/AmarPersaud_Resume.pdf
diff --git a/elementexamples.html b/elementexamples.html
@@ -105,4 +105,4 @@ <h2>
   <script src="/js/js.min.js" type="text/javascript">
   </script>
  </body>
-</html>
+</html>
diff --git a/index.html b/index.html
@@ -65,7 +65,7 @@ <h1 class="covertag">
       Amar Persaud
      </h1>
      <p class="coverside">
-      Student, software developer, and Electrical Engineer
+      Electrical Engineer and Software developer
      </p>
      <span class="coverbutton">
       <a class="button" href="/projects.html">
@@ -94,4 +94,4 @@ <h1 class="covertag">
   <script src="/js/homepage.min.js" type="text/javascript">
   </script>
  </body>
-</html>
+</html>
diff --git a/js/homepage.js b/js/homepage.js
@@ -132,7 +132,9 @@ function createIcon(){
 		y: ((Math.random() * (spawnMaxHeight - spawnMinHeight)) + spawnMinHeight), 
 		vx: 0, 
 		vy: (Math.random() * vmax), 
-		z: 0,
+		va: (Math.random() / 1000.0), 
+		z: (Math.random() / 2.0 + 0.5),
+		va: 0,
 		angle: Math.random(), 
 		iconclass: validIconClasses[Math.floor(Math.random() * validIconClasses.length)], 
 		idn: currentId, 
@@ -149,7 +151,7 @@ function createIcon(){
 	let newElem = document.createElement("i");
 	newElem.setAttribute("class", "frontanimicon " + newicon.iconclass);
 	newElem.setAttribute("id",  newicon.eid);
-	newElem.setAttribute("style", `left: ${newicon.x.toFixed(3)}px; top: ${newicon.y.toFixed(3)}px;`);
+	newElem.setAttribute("style", `left: ${newicon.x.toFixed(3)}px; top: ${newicon.y.toFixed(3)}px; transform: scale(${newicon.z.toFixed(3)}) rotate(${newicon.angle*360}deg);`);
 
 	contentElem.appendChild(newElem);
 }
@@ -160,8 +162,9 @@ function createIconRandom(){
 		x: (Math.random() * screenW), 
 		y: (Math.random() * screenH), 
 		vx: 0, 
-		vy: (Math.random() * vmax), 
-		z: 0,
+		vy: (Math.random() * vmax),
+		va: (Math.random() / 1000.0),
+		z: (Math.random() / 2.0 + 0.5),
 		angle: Math.random(), 
 		iconclass: validIconClasses[Math.floor(Math.random() * validIconClasses.length)], 
 		idn: currentId, 
@@ -178,7 +181,7 @@ function createIconRandom(){
 	let newElem = document.createElement("i");
 	newElem.setAttribute("class", "frontanimicon " + newicon.iconclass);
 	newElem.setAttribute("id",  newicon.eid);
-	newElem.setAttribute("style", `left: ${newicon.x.toFixed(3)}px; top: ${newicon.y.toFixed(3)}px;`);
+	newElem.setAttribute("style", `left: ${newicon.x.toFixed(3)}px; top: ${newicon.y.toFixed(3)}px; transform: scale(${newicon.z.toFixed(3)}) rotate(${newicon.angle*360}deg);`);
 
 	contentElem.appendChild(newElem);
 }
@@ -224,6 +227,7 @@ function updateIcons(){
 
 		ic.vx += windAccelx * dt;
 		ic.vy += windAccely * dt;
+		ic.va += windAccelx * dt / 1000.0;
 
 		//clamp velocity
 		let vel = Math.sqrt((ic.vx * ic.vx) + (ic.vy * ic.vy));
@@ -232,9 +236,14 @@ function updateIcons(){
 			ic.vy = ic.vy / vel * vmax;
 		}
 
+		if(Math.sqrt(ic.va * ic.va) >= 0.1){
+			ic.va = ic.va / Math.sqrt(ic.va * ic.va) * 0.1;
+		}
+
 		//Apply velocity to position
 		ic.x += ic.vx * dt;
 		ic.y += ic.vy * dt;
+		ic.angle += ic.va * dt;
 
 		//find element
 
@@ -251,7 +260,7 @@ function updateIcons(){
 			snowicons[i] = ic;
 
 			//update element position
-			iconElem.setAttribute("style", `left: ${ic.x.toFixed(3)}px; top: ${ic.y.toFixed(3)}px; transform: rotate(${ic.angle*360}deg);`);
+			iconElem.setAttribute("style", `left: ${ic.x.toFixed(3)}px; top: ${ic.y.toFixed(3)}px; transform: scale(${ic.z.toFixed(3)}) rotate(${ic.angle*360}deg);`);
 		}
 	}
 

diff --git a/js/homepage.min.js b/js/homepage.min.js
diff --git a/projects.html b/projects.html
@@ -173,4 +173,4 @@ <h2 class="sub-header">
   <script src="/js/projectlist.min.js" type="text/javascript">
   </script>
  </body>
-</html>
+</html>
diff --git a/search.html b/search.html
@@ -99,4 +99,4 @@ <h1 class="page-header">
   <script src="js/search.min.js" type="text/javascript">
   </script>
  </body>
-</html>
+</html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -105,4 +105,4 @@ <h2> @@
       <script src="/js/js.min.js" type="text/javascript">
       </script>
      </body>
-    </html>
+    </html>