Skip to content

Commit

Permalink
Merge pull request 0xFloyd#14 from 0xFloyd/heroku-22-update
Browse files Browse the repository at this point in the history
Heroku 22 update
  • Loading branch information
0xFloyd authored Aug 23, 2022
2 parents 32ebc88 + 6f4a766 commit 722d257
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

As a quarantine project, I wanted to learn 3D web development, and decided to revamp my portfolio into an interactive 3D world built using [Three.js](https://github.com/mrdoob/three.js) and [Ammo.js](https://github.com/kripken/ammo.js), a port of the [Bullet physics engine](https://pybullet.org/wordpress/) to JavaScript. I had an absolute blast making this!

Try it out! [https://www.ryan-floyd.com/](https://www.ryan-floyd.com/)
Try it out! [https://www.0xfloyd.com/](https://www.0xfloyd.com/)

I wrote an article explaining the site [here](https://dev.to/0xfloyd/create-an-interactive-3d-portfolio-website-that-stands-out-to-employers-47gc)

Expand Down
10 changes: 5 additions & 5 deletions src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ Ammo().then((Ammo) => {

//create Ammo.js body to add solid mass to "Software Engineer"
function floydWords(x, y, z) {
const boxScale = { x: 46, y: 3, z: 2 };
const boxScale = { x: 37, y: 3, z: 2 };
let quat = { x: 0, y: 0, z: 0, w: 1 };
let mass = 0; //mass of zero = infinite mass

Expand Down Expand Up @@ -861,7 +861,7 @@ Ammo().then((Ammo) => {

createBillboardRotated(-17, 1.25, -75, billboardTextures.homeSweetHomeTexture, URL.githubHomeSweetHome, Math.PI * 0.15);

floydWords(11.2, 1, -20);
floydWords(16.2, 1, -20);
createTextOnPlane(-70, 0.01, -48, inputText.terpSolutionsText, 20, 40);
createTextOnPlane(-42, 0.01, -53, inputText.bagholderBetsText, 20, 40);
createTextOnPlane(-14, 0.01, -49, inputText.homeSweetHomeText, 20, 40);
Expand All @@ -881,7 +881,7 @@ Ammo().then((Ammo) => {
// true
// );

createBox(19, 2, -70, 4, 4, 1, boxTexture.LinkedIn, URL.LinkedIn, 0x0077b5, true);
createBox(19, 2, -70, 4, 4, 1, boxTexture.twitter, URL.twitter, 0x0077b5, true);
// createBox(
// 35,
// 2,
Expand Down Expand Up @@ -913,7 +913,7 @@ Ammo().then((Ammo) => {

// floatingLabel(3.875, 4.5, -70, 'Twitter');
floatingLabel(11.875, 4.5, -70, 'Github');
floatingLabel(19.125, 4.5, -70, 'LinkedIn');
floatingLabel(19.125, 4.5, -70, 'Twitter');
floatingLabel(26.875, 4.5, -70, 'Email');
// floatingLabel(35, 6.5, -70, ' Static \nWebsite');
floatingLabel(35, 6.5, -70, ' How I \nmade this');
Expand Down Expand Up @@ -941,7 +941,7 @@ Ammo().then((Ammo) => {

simpleText(23, 0.01, -60, touchText, 1.5);
// simpleText(-50, 0.01, -5, 'SKILLS', 3);
simpleText(-42, 0.01, -30, 'EXPERIENCE', 3);
simpleText(-42, 0.01, -30, 'PROJECTS', 3);
simpleText(61, 0.01, -15, 'TIMELINE', 3);

wallOfBricks();
Expand Down
Binary file modified src/jsm/activities_text.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 722d257

Please sign in to comment.