reorganization of files and folders

cal-cs184-student · Feb 14, 2024 · 17c6f3f · 17c6f3f
1 parent efc4b09
commit 17c6f3f
Show file tree

Hide file tree

Showing 26 changed files with 140 additions and 82 deletions.
diff --git a/hw1/bestpic.png → homeworks/hw1/bestpic.png b/hw1/bestpic.png → homeworks/hw1/bestpic.png
diff --git a/hw1/index.html → homeworks/hw1/index.html b/hw1/index.html → homeworks/hw1/index.html
@@ -32,22 +32,58 @@ <h6 class="text-center mt-1"></h6>
 
  <ul class="nav nav-tabs navbarmargins justify-content-center">
  <li class="nav-item">
- <a class="nav-link" href="#task-1">Task 1</a>
+ <button
+ type="button"
+ class="btn-transparent nav-link"
+ onclick="scrollToTask('#task-1')"
+ >
+ Task 1
+ </button>
  </li>
  <li class="nav-item">
- <a class="nav-link" href="#task-2">Task 2</a>
+ <button
+ type="button"
+ class="btn-transparent nav-link"
+ onclick="scrollToTask('#task-2')"
+ >
+ Task 2
+ </button>
  </li>
  <li class="nav-item">
- <a class="nav-link" href="#task-3">Task 3</a>
+ <button
+ type="button"
+ class="btn-transparent nav-link"
+ onclick="scrollToTask('#task-3')"
+ >
+ Task 3
+ </button>
  </li>
  <li class="nav-item">
- <a class="nav-link" href="#task-4">Task 4</a>
+ <button
+ type="button"
+ class="btn-transparent nav-link"
+ onclick="scrollToTask('#task-4')"
+ >
+ Task 4
+ </button>
  </li>
  <li class="nav-item">
- <a class="nav-link" href="#task-5">Task 5</a>
+ <button
+ type="button"
+ class="btn-transparent nav-link"
+ onclick="scrollToTask('#task-5')"
+ >
+ Task 5
+ </button>
  </li>
  <li class="nav-item">
- <a class="nav-link" href="#task-6">Task 6</a>
+ <button
+ type="button"
+ class="btn-transparent nav-link"
+ onclick="scrollToTask('#task-6')"
+ >
+ Task 6
+ </button>
  </li>
  </ul>
 
@@ -726,7 +762,7 @@ <h3>Task 6: "Level sampling" with mipmaps for texture mapping</h3>
 
  <hr class="breakline-bottom" />
 
- <!-- ui -->
+ <!-- UI -->
 
  <button class="btn btn-primary scroll-to-top" onclick="scrollToTop()">
  Scroll to Top
@@ -739,28 +775,7 @@ <h3>Task 6: "Level sampling" with mipmaps for texture mapping</h3>
  <!-- Bootstrap JS -->
  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
 
- <script>
- // Function to scroll to the top of the page
- function scrollToTop() {
- window.scrollTo({ top: 0, behavior: "smooth" });
- if (history.replaceState) {
- var urlWithoutHash = window.location.href.split("#")[0];
- history.replaceState(null, null, urlWithoutHash);
- }
- }
-
- // Show/Hide scroll-to-top button based on scroll position
- window.onscroll = function () {
- var scrollButton = document.querySelector(".scroll-to-top");
- if (
- document.body.scrollTop > 20 ||
- document.documentElement.scrollTop > 20
- ) {
- scrollButton.style.display = "block";
- } else {
- scrollButton.style.display = "none";
- }
- };
- </script>
+ <!-- scroll functions -->
+ <script src="../template.js"></script>
  </body>
 </html>
diff --git a/hw1/lnearest_plinear.png → homeworks/hw1/lnearest_plinear.png b/hw1/lnearest_plinear.png → homeworks/hw1/lnearest_plinear.png
diff --git a/hw1/lnearest_pnearest.png → homeworks/hw1/lnearest_pnearest.png b/hw1/lnearest_pnearest.png → homeworks/hw1/lnearest_pnearest.png
diff --git a/hw1/lzero_plinear.png → homeworks/hw1/lzero_plinear.png b/hw1/lzero_plinear.png → homeworks/hw1/lzero_plinear.png
diff --git a/hw1/lzero_pnearest.png → homeworks/hw1/lzero_pnearest.png b/hw1/lzero_pnearest.png → homeworks/hw1/lzero_pnearest.png
diff --git a/hw1/task1.png → homeworks/hw1/task1.png b/hw1/task1.png → homeworks/hw1/task1.png
diff --git a/hw1/task2s1.png → homeworks/hw1/task2s1.png b/hw1/task2s1.png → homeworks/hw1/task2s1.png
diff --git a/hw1/task2s16.png → homeworks/hw1/task2s16.png b/hw1/task2s16.png → homeworks/hw1/task2s16.png
diff --git a/hw1/task2s4.png → homeworks/hw1/task2s4.png b/hw1/task2s4.png → homeworks/hw1/task2s4.png
diff --git a/hw1/task2s9.png → homeworks/hw1/task2s9.png b/hw1/task2s9.png → homeworks/hw1/task2s9.png
diff --git a/hw1/task3.png → homeworks/hw1/task3.png b/hw1/task3.png → homeworks/hw1/task3.png
diff --git a/hw1/task3_custom.png → homeworks/hw1/task3_custom.png b/hw1/task3_custom.png → homeworks/hw1/task3_custom.png
diff --git a/hw1/task4.png → homeworks/hw1/task4.png b/hw1/task4.png → homeworks/hw1/task4.png
diff --git a/hw1/task5bi1.png → homeworks/hw1/task5bi1.png b/hw1/task5bi1.png → homeworks/hw1/task5bi1.png
diff --git a/hw1/task5bi16.png → homeworks/hw1/task5bi16.png b/hw1/task5bi16.png → homeworks/hw1/task5bi16.png
diff --git a/hw1/task5bi1extra.png → homeworks/hw1/task5bi1extra.png b/hw1/task5bi1extra.png → homeworks/hw1/task5bi1extra.png
diff --git a/hw1/task5ns1.png → homeworks/hw1/task5ns1.png b/hw1/task5ns1.png → homeworks/hw1/task5ns1.png
diff --git a/hw1/task5ns16.png → homeworks/hw1/task5ns16.png b/hw1/task5ns16.png → homeworks/hw1/task5ns16.png
diff --git a/hw1/task5ns1extra.png → homeworks/hw1/task5ns1extra.png b/hw1/task5ns1extra.png → homeworks/hw1/task5ns1extra.png
diff --git a/hw2/index.html → homeworks/hw2/index.html b/hw2/index.html → homeworks/hw2/index.html
@@ -1,3 +1,5 @@
+<!-- CHANGE the link tags if you want to see template -->
+
 <!DOCTYPE html>
 <html lang="en">
  <head>
@@ -15,7 +17,7 @@
  integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
  crossorigin="anonymous"
  />
- <link rel="stylesheet" href="template.css" />
+ <link rel="stylesheet" href="../template.css" />
 
  <title>Template</title>
  </head>
@@ -32,13 +34,31 @@ <h6 class="text-center mt-1"></h6>
 
  <ul class="nav nav-tabs navbarmargins justify-content-center">
  <li class="nav-item">
- <a class="nav-link" href="#task-1">Task 1</a>
+ <button
+ type="button"
+ class="btn-transparent nav-link"
+ onclick="scrollToTask('#task-1')"
+ >
+ Task 1
+ </button>
  </li>
  <li class="nav-item">
- <a class="nav-link" href="#task-2">Task 2</a>
+ <button
+ type="button"
+ class="btn-transparent nav-link"
+ onclick="scrollToTask('#task-2')"
+ >
+ Task 2
+ </button>
  </li>
  <li class="nav-item">
- <a class="nav-link" href="#task-3">Task 3</a>
+ <button
+ type="button"
+ class="btn-transparent nav-link"
+ onclick="scrollToTask('#task-3')"
+ >
+ Task 3
+ </button>
  </li>
  </ul>
 
@@ -286,7 +306,7 @@ <h3>Task 3: ___</h3>
 
  <hr class="breakline-bottom" />
 
- <!-- ui -->
+ <!-- UI -->
 
  <button class="btn btn-primary scroll-to-top" onclick="scrollToTop()">
  Scroll to Top
@@ -299,24 +319,7 @@ <h3>Task 3: ___</h3>
  <!-- Bootstrap JS -->
  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
 
- <script>
- // Function to scroll to the top of the page
- function scrollToTop() {
- window.scrollTo({ top: 0, behavior: "smooth" });
- }
-
- // Show/Hide scroll-to-top button based on scroll position
- window.onscroll = function () {
- var scrollButton = document.querySelector(".scroll-to-top");
- if (
- document.body.scrollTop > 20 ||
- document.documentElement.scrollTop > 20
- ) {
- scrollButton.style.display = "block";
- } else {
- scrollButton.style.display = "none";
- }
- };
- </script>
+ <!-- scroll functions -->
+ <script src="../template.js"></script>
  </body>
 </html>
diff --git a/hw3/index.html → homeworks/hw3/index.html b/hw3/index.html → homeworks/hw3/index.html
diff --git a/hw4/index.html → homeworks/hw4/index.html b/hw4/index.html → homeworks/hw4/index.html
diff --git a/template.css → homeworks/template.css b/template.css → homeworks/template.css
@@ -5,6 +5,21 @@
  margin-bottom: 2rem;
 }
 
+.btn-transparent {
+ background-color: transparent;
+ border: none;
+ color: #543dda;
+}
+
+.btn-transparent:hover {
+ border: 1px solid #007bff;
+}
+
+.btn-transparent:focus {
+ outline: none;
+ box-shadow: none;
+}
+
 .taskbox-outer {
  margin-top: 5rem;
  margin-bottom: 5rem;

diff --git a/template.html → homeworks/template.html b/template.html → homeworks/template.html
@@ -1,3 +1,5 @@
+<!-- CHANGE the link tags if you want to see template -->
+
 <!DOCTYPE html>
 <html lang="en">
  <head>
@@ -15,7 +17,7 @@
  integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T"
  crossorigin="anonymous"
  />
- <link rel="stylesheet" href="template.css" />
+ <link rel="stylesheet" href="../template.css" />
 
  <title>Template</title>
  </head>
@@ -32,13 +34,31 @@ <h6 class="text-center mt-1"></h6>
 
  <ul class="nav nav-tabs navbarmargins justify-content-center">
  <li class="nav-item">
- <a class="nav-link" href="#task-1">Task 1</a>
+ <button
+ type="button"
+ class="btn-transparent nav-link"
+ onclick="scrollToTask('#task-1')"
+ >
+ Task 1
+ </button>
  </li>
  <li class="nav-item">
- <a class="nav-link" href="#task-2">Task 2</a>
+ <button
+ type="button"
+ class="btn-transparent nav-link"
+ onclick="scrollToTask('#task-2')"
+ >
+ Task 2
+ </button>
  </li>
  <li class="nav-item">
- <a class="nav-link" href="#task-3">Task 3</a>
+ <button
+ type="button"
+ class="btn-transparent nav-link"
+ onclick="scrollToTask('#task-3')"
+ >
+ Task 3
+ </button>
  </li>
  </ul>
 
@@ -286,7 +306,7 @@ <h3>Task 3: ___</h3>
 
  <hr class="breakline-bottom" />
 
- <!-- ui -->
+ <!-- UI -->
 
  <button class="btn btn-primary scroll-to-top" onclick="scrollToTop()">
  Scroll to Top
@@ -299,28 +319,7 @@ <h3>Task 3: ___</h3>
  <!-- Bootstrap JS -->
  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
 
- <script>
- // Function to scroll to the top of the page
- function scrollToTop() {
- window.scrollTo({ top: 0, behavior: "smooth" });
- if (history.replaceState) {
- var urlWithoutHash = window.location.href.split("#")[0];
- history.replaceState(null, null, urlWithoutHash);
- }
- }
-
- // Show/Hide scroll-to-top button based on scroll position
- window.onscroll = function () {
- var scrollButton = document.querySelector(".scroll-to-top");
- if (
- document.body.scrollTop > 20 ||
- document.documentElement.scrollTop > 20
- ) {
- scrollButton.style.display = "block";
- } else {
- scrollButton.style.display = "none";
- }
- };
- </script>
+ <!-- scroll functions -->
+ <script src="../template.js"></script>
  </body>
 </html>
diff --git a/homeworks/template.js b/homeworks/template.js
@@ -0,0 +1,26 @@
+// Function to scroll to the top of the page
+function scrollToTop() {
+ window.scrollTo({ top: 0, behavior: "smooth" });
+ if (history.replaceState) {
+ var urlWithoutHash = window.location.href.split("#")[0];
+ history.replaceState(null, null, urlWithoutHash);
+ }
+}
+
+// Show/Hide scroll-to-top button based on scroll position
+window.onscroll = function () {
+ var scrollButton = document.querySelector(".scroll-to-top");
+ if (document.body.scrollTop > 20 || document.documentElement.scrollTop > 20) {
+ scrollButton.style.display = "block";
+ } else {
+ scrollButton.style.display = "none";
+ }
+};
+
+// Function to scroll to each task
+function scrollToTask(taskId) {
+ var task = document.querySelector(taskId);
+ if (task) {
+ window.scrollTo({ top: task.offsetTop, behavior: "smooth" });
+ }
+}