[WIP] Directional Avatar

.gitignore

@@ -7,4 +7,9 @@ public/js/bundle.js
 images/project_thumbnails
 .cache
 dist/
-utilities/getProjectThumbnails/projectThumbnails
+utilities/getProjectThumbnails/projectThumbnails
+utilities/100DaysScripts/package-lock.json
+**/instagram-scraper*
+src/assets/images/100Days
+utilities/100DaysScripts/*.log
+utilities/100DaysScripts/latestScrapes.txt

.prettierrc.json

@@ -1,7 +1,7 @@
 {
  "trailingComma": "es5",
  "tabWidth": 4,
- "semi": false,
+ "semi": true,
  "singleQuote": true,
  "printWidth": 200
 }

README.md

@@ -1,4 +1,4 @@
-![image of 3D environment with one person in it](docs/images/yorb-2020.png "YORB 2020")
+![image of 3D environment with many people moving around](docs/images/winter-show-2020.png "YORB 2020")
 
 ## About
 

docs/CONTRIBUTING.md

@@ -6,7 +6,7 @@ If you want to run the code locally, you can do so against either the ITP Yorb s
 
 1. Clone or fork the repository and download a local copy:
  ```bash
- git clone https://github.com/AidanNelson/YORB2020.git
+ git clone https://github.com/yorb-club/YORB2020.git
  ```
 2. Navigate into the repository and install dependencies:
  ```bash
@@ -44,14 +44,20 @@ If you want to run the code locally, you can do so against either the ITP Yorb s
  cd server
  npm install
  ```
-4. Change directory again back to the root directory of the project and start the server:
+4. Create a new file in the `/server` folder called `.env` and copy the contents of `example.env` into it. Adjust the `PRODUCTION_IP` to reflect your computer's IP address on the local network:
+ ```
+ PROJECT_DATABASE_URL = 'https://itp.nyu.edu/projects/public/projectsJSON_ALL.php?venue_id=164&room_id=1' 
+ PRODUCTION_IP="192.168.0.107"
+ PRODUCTION_PORT="3000"
+ ```
+5. Change directory again back to the root directory of the project and start the server:
  ```bash
  cd ..
  npm run start-server
  ```
-5. In a separate terminal window (in the root directory of the project), start the build system (same as step #4 from above):
+6. In a separate terminal window (in the root directory of the project), start the build system (same as step #4 from above):
  ```bash
  npm run watch
  ```
-6. Navigate your browser window to http://localhost:1234. This page should now connect to your backend server at http://localhost:3000.
-7. Note that you may need to restart this local development server / build system from time to time to ensure that your changes are being reflected in the browser!
+7. Navigate your browser window to http://localhost:1234. This page should now connect to your backend server at http://localhost:3000.
+8. Note that you may need to restart this local development server / build system from time to time to ensure that your changes are being reflected in the browser!

package.json

@@ -16,7 +16,7 @@
  "mediasoup-client": "^3.6.5",
  "p5": "^1.0.0",
  "socket.io-client": "^3.0.3",
- "three": "^0.115.0"
+ "three": "^0.127.0"
  },
  "devDependencies": {
  "cssnano": "^4.1.10",

server/package.json

@@ -8,7 +8,8 @@
  "dotenv": "^8.2.0",
  "express": "^4.17.1",
  "mediasoup": "^3.6.28",
- "socket.io": "^3.0.3"
+ "socket.io": "^3.0.3",
+ "ssl-root-cas": "^1.3.1"
  },
  "devDependencies": {},
  "author": "",

server/server.js

@@ -31,6 +31,10 @@ const debugModule = require('debug')
 const mediasoup = require('mediasoup')
 const fs = require('fs')
 const https = require('https')
+https.globalAgent.options.ca = require('ssl-root-cas').create();
+
+process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = 0
+
 
 // HTTP Server setup:
 // https://stackoverflow.com/questions/27393705/how-to-resolve-a-socket-io-404-not-found-error
@@ -208,6 +212,7 @@ main()
 
 async function updateProjects() {
  let url = process.env.PROJECT_DATABASE_URL
+ console.log('Updating Projects from Database...');
 
  https
  .get(url, (res) => {

src/index.html

@@ -38,10 +38,9 @@
  <div class="bottom_bar_container">
  <div class="bottom_bar">
  <div id="project-details">
- <div class="box-title">ITP Winter Show 2020</div>
+ <div class="box-title">ITP Spring Show 2021 Gallery</div>
  <div class="box-content">
- Wed Dec 16th, 8-10 p.m. ET <br />
- Thu Dec 17th, 8-10 p.m. ET <br /><br />
+ Remarks – Thurs May 16th, 10 am - 12 pm ET <br /><br />
  </div>
  <div class="box-content" id="html-project-list">
  </div>
@@ -50,13 +49,13 @@
  <div>
  <div class="box-title">CONTROLS:</div>
  <div class="box-content">
- ESCAPE.......exit<br />
- WASD.........move<br />
- SPACEBAR.....jump<br />
- MOUSE........look<br />
- C............webcam<br />
- M............mic<br />
- 1............paint
+ WASD..........move<br />
+ SPACEBAR......jump<br />
+ MOUSE.........look<br />
+ SHIFT+CLICK...interact<br />
+ C.............webcam<br />
+ M.............mic<br />
+ 1.............paint
  </div>
  <br />
  </div>

src/js/yorbControls2.js → src/js/controls.js

@@ -1,6 +1,6 @@
 import * as THREE from 'three'
 
-export class YorbControls2 {
+export class Controls {
  constructor(scene, camera, renderer) {
  this.scene = scene
  this.camera = camera