moved some slides, changed some others
1
.gitignore
vendored
@@ -6,3 +6,4 @@ Session.vim
|
||||
*~
|
||||
.DS_Store
|
||||
!node_modules
|
||||
node_modules
|
||||
|
||||
BIN
img/livada.jpg
|
Before Width: | Height: | Size: 2.4 MiB After Width: | Height: | Size: 785 KiB |
BIN
img/maglic.jpg
Normal file
|
After Width: | Height: | Size: 666 KiB |
BIN
img/slide1.jpeg
|
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 83 KiB |
BIN
img/slide14.jpeg
|
Before Width: | Height: | Size: 84 KiB After Width: | Height: | Size: 313 KiB |
BIN
img/slide3.jpeg
|
Before Width: | Height: | Size: 101 KiB After Width: | Height: | Size: 72 KiB |
45
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,
|
||||
|
||||
@@ -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 <https://github.com/npm/npm/issues>
|
||||
12 verbose exit [ 1, true ]
|
||||