diff --git a/.gitignore b/.gitignore index 47c36b5..0aad788 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ Session.vim *~ .DS_Store !node_modules +node_modules diff --git a/img/livada.jpg b/img/livada.jpg index 3bbb5e4..a1edab1 100644 Binary files a/img/livada.jpg and b/img/livada.jpg differ diff --git a/img/maglic.jpg b/img/maglic.jpg new file mode 100644 index 0000000..11f0e9d Binary files /dev/null and b/img/maglic.jpg differ diff --git a/img/slide1.jpeg b/img/slide1.jpeg index 9144879..2353899 100644 Binary files a/img/slide1.jpeg and b/img/slide1.jpeg differ diff --git a/img/slide14.jpeg b/img/slide14.jpeg index c0b309a..8a8c9c2 100644 Binary files a/img/slide14.jpeg and b/img/slide14.jpeg differ diff --git a/img/slide3.jpeg b/img/slide3.jpeg index ec3b16b..df6b402 100644 Binary files a/img/slide3.jpeg and b/img/slide3.jpeg differ diff --git a/index.html b/index.html index 40a7a10..f1658c8 100644 --- a/index.html +++ b/index.html @@ -396,7 +396,7 @@ effect.setSize(window.innerWidth, window.innerHeight); var loader = new THREE.TextureLoader(); - loader.load('img/livada.jpg', onTextureLoaded); + loader.load('img/maglic.jpg', onTextureLoaded); // // Create 3D objects. // var geometry = new THREE.SphereGeometry(0.5, 0.5, 0.5); @@ -502,7 +502,7 @@ var pos6 = positions[6]; - displayText("verygoodpoint.net", { + displayText("Q and A", { color: 0x00ff00, size: 2, height: 0.04, @@ -516,7 +516,7 @@ var pos7 = positions[7]; - displayText("Q and A", { + displayText("@senaduka", { color: 0x00ff00, size: 2, height: 0.04, @@ -526,46 +526,11 @@ y: pos7.y, z: pos7.z - 5 }); - - - - - - - //displayText("Senad Uka", { - // color: 0x00ff00, - // size: 0.3, - // height: 0.01, - // specular: 0xaaaaaa - // }, { - // x: 2, - // y: heightOfUser + 2, - // z: -2 - // }, { - // x: 0.1, - // y: degreesToRadians(-35), - // z: 0 - // }); - - // displayText("JS Meetup Sarajevo", { - // color: 0xaaff12, - // size: 0.3, - // height: 0.02, - // specular: 0x11aaaa - // }, { - // x: 2, - // y: heightOfUser - 1, - // z: -2 - // }, { - // x: degreesToRadians(-40), - // y: degreesToRadians(0), - // z: 0 - // }); - }); + }); // 1 pravo - displayPicture('./img/testba.png', { + displayPicture('./img/slide1.jpeg', { width: 10, height: 5, depth: 0.1, diff --git a/npm-debug.log b/npm-debug.log deleted file mode 100644 index 2b1717c..0000000 --- a/npm-debug.log +++ /dev/null @@ -1,26 +0,0 @@ -0 info it worked if it ends with ok -1 verbose cli [ '/Users/senaduka/.nvm/versions/node/v7.2.0/bin/node', -1 verbose cli '/Users/senaduka/.nvm/versions/node/v7.2.0/bin/npm', -1 verbose cli 'start' ] -2 info using npm@3.10.9 -3 info using node@v7.2.0 -4 verbose stack Error: missing script: start -4 verbose stack at run (/Users/senaduka/.nvm/versions/node/v7.2.0/lib/node_modules/npm/lib/run-script.js:151:19) -4 verbose stack at /Users/senaduka/.nvm/versions/node/v7.2.0/lib/node_modules/npm/lib/run-script.js:61:5 -4 verbose stack at /Users/senaduka/.nvm/versions/node/v7.2.0/lib/node_modules/npm/node_modules/read-package-json/read-json.js:356:5 -4 verbose stack at checkBinReferences_ (/Users/senaduka/.nvm/versions/node/v7.2.0/lib/node_modules/npm/node_modules/read-package-json/read-json.js:320:45) -4 verbose stack at final (/Users/senaduka/.nvm/versions/node/v7.2.0/lib/node_modules/npm/node_modules/read-package-json/read-json.js:354:3) -4 verbose stack at then (/Users/senaduka/.nvm/versions/node/v7.2.0/lib/node_modules/npm/node_modules/read-package-json/read-json.js:124:5) -4 verbose stack at /Users/senaduka/.nvm/versions/node/v7.2.0/lib/node_modules/npm/node_modules/read-package-json/read-json.js:311:12 -4 verbose stack at /Users/senaduka/.nvm/versions/node/v7.2.0/lib/node_modules/npm/node_modules/graceful-fs/graceful-fs.js:78:16 -4 verbose stack at tryToString (fs.js:425:3) -4 verbose stack at FSReqWrap.readFileAfterClose [as oncomplete] (fs.js:412:12) -5 verbose cwd /Users/senaduka/projects/senad/2jsmeetupwebvr -6 error Darwin 16.7.0 -7 error argv "/Users/senaduka/.nvm/versions/node/v7.2.0/bin/node" "/Users/senaduka/.nvm/versions/node/v7.2.0/bin/npm" "start" -8 error node v7.2.0 -9 error npm v3.10.9 -10 error missing script: start -11 error If you need help, you may report this error at: -11 error -12 verbose exit [ 1, true ]