From 47a9925f3c551600c3b1e33129df584c1834e7d6 Mon Sep 17 00:00:00 2001 From: Thomas FORGIONE Date: Tue, 21 Jul 2015 17:09:03 +0200 Subject: [PATCH] New recommendations --- js/l3d/apps/prototype/interactive/main.js | 3 +- js/l3d/src/cameras/PointerCamera.js | 2 +- js/l3d/src/scenes/initScene.js | 137 ++++++++++------------ utils/demon.sh | 2 - 4 files changed, 67 insertions(+), 77 deletions(-) diff --git a/js/l3d/apps/prototype/interactive/main.js b/js/l3d/apps/prototype/interactive/main.js index 3b7d55c..673f861 100644 --- a/js/l3d/apps/prototype/interactive/main.js +++ b/js/l3d/apps/prototype/interactive/main.js @@ -111,7 +111,8 @@ function initCanvases() { function initModels() { // Init recommendations - recommendations = initMainScene(camera1, scene, coins, clickableObjects); + // recommendations = initMainScene(camera1, scene, coins, clickableObjects); + recommendations = L3D.initWhomp(camera1, scene, coins, clickableObjects); // init clickable objects var i; diff --git a/js/l3d/src/cameras/PointerCamera.js b/js/l3d/src/cameras/PointerCamera.js index bacc75d..2941769 100644 --- a/js/l3d/src/cameras/PointerCamera.js +++ b/js/l3d/src/cameras/PointerCamera.js @@ -674,7 +674,7 @@ L3D.PointerCamera.prototype.onMouseUp = function(event) { * Logs the camera to the terminal (pratical to create recommended views) */ L3D.PointerCamera.prototype.log = function() { - console.log("createCamera(\nnew THREE.Vector3(" + this.position.x + "," + this.position.y + ',' + this.position.z + '),\n' + + console.log("createRecommendation(\nnew THREE.Vector3(" + this.position.x + "," + this.position.y + ',' + this.position.z + '),\n' + "new THREE.Vector3(" + this.target.x + "," + this.target.y + ',' + this.target.z + ')\n)'); }; diff --git a/js/l3d/src/scenes/initScene.js b/js/l3d/src/scenes/initScene.js index 59be4db..a41a63c 100644 --- a/js/l3d/src/scenes/initScene.js +++ b/js/l3d/src/scenes/initScene.js @@ -275,48 +275,48 @@ L3D.createBobombRecommendations = function(width, height) { recos.push( createRecommendation( - new THREE.Vector3(37.24445046448742,17.56004329173052,-13.432945825465112), - new THREE.Vector3(15.446296842638255,0.7142524861838169,15.568085721947512) + new THREE.Vector3(22.81974561274774,23.728166674516967,-23.50757340835654), + new THREE.Vector3(27.45807332015761,4.665400463440239,11.350666083340474) ), createRecommendation( - new THREE.Vector3(-24.10987782946019,26.75997424452833,-24.7814217620827), - new THREE.Vector3(-13.724964120740987,14.939165978074758,11.993869660150779) + new THREE.Vector3(4.512241856806823,19.542184465749266,-21.6277607809511), + new THREE.Vector3(-16.322542559288507,6.552211144388629,9.95027512132075) ), createRecommendation( - new THREE.Vector3(7.162458619916293,18.414234017280627,-10.871480453809644), - new THREE.Vector3(-27.47061192698706,3.9199238382137196,2.9294396939998144) + new THREE.Vector3(3.7236872166568786,11.547542009941035,7.743737673292326), + new THREE.Vector3(11.778234958188895,3.590700880634021,46.107951987185814) ), createRecommendation( - new THREE.Vector3(19.741775033926334,14.132046557015727,-25.338452829449857), - new THREE.Vector3(-18.0898892760213,1.5191520612050162,-28.449733590966297) + new THREE.Vector3(17.51280189401515,22.651733665113007,32.1344270612909), + new THREE.Vector3(-17.09689080040822,6.202382514300329,20.663244981189692) ), createRecommendation( - new THREE.Vector3(-13.484471970922971,20.25938194278451,-30.850247430073622), - new THREE.Vector3(-42.04654352929252,-7.608886431102082,-28.099304657929874) + new THREE.Vector3(-12.00887621348721,25.979463024729398,37.05007506157123), + new THREE.Vector3(-6.018501236275041,9.054329353511584,1.3057712098552159) ), createRecommendation( - new THREE.Vector3(23.58849177613168,18.628351213754488,31.516769692916675), - new THREE.Vector3(8.319765065757787,-0.5486703304136178,-0.09189730426033549) + new THREE.Vector3(-9.467050533255307,30.088761873923442,28.727671886170505), + new THREE.Vector3(-39.96888839418932,10.735797300746938,11.549178083317258) ), createRecommendation( - new THREE.Vector3(5.068708131530766,11.201320390433953,9.77462743108436), - new THREE.Vector3(9.20744154720096,3.8549750522404134,48.87580511010085) + new THREE.Vector3(-30.2051081707108,44.36298906887656,35.77746943907231), + new THREE.Vector3(-16.54652438711394,19.924260316887796,7.208401795672) ), createRecommendation( - new THREE.Vector3(4.18086580540298,16.54831275414988,29.96253548469186), - new THREE.Vector3(-17.059296481928556,3.408610856102113,-1.2817238286325505) + new THREE.Vector3(-52.44058113318328,27.688845222097196,28.78379753054363), + new THREE.Vector3(-21.760754138048632,11.37128676599093,8.972550684871294) ), createRecommendation( - new THREE.Vector3(-44.56340663230823,22.567957426093283,14.856920056929788), - new THREE.Vector3(-20.052660826451827,7.556450599683849,42.67558290835663) + new THREE.Vector3(-32.51800140864256,30.21720398723899,-2.2695677339908484), + new THREE.Vector3(-4.161205509090522,12.002869652965245,-23.813247806588592) ), createRecommendation( - new THREE.Vector3(11.29580093093769,15.03666008708929,31.377195488571406), - new THREE.Vector3(-28.288314738873957,13.648654387264967,25.794075678265735) + new THREE.Vector3(-24.869080810307878,24.29489455015078,-48.36061039882109), + new THREE.Vector3(-16.792809571743753,4.99108388972596,-14.270483721620096) ), createRecommendation( - new THREE.Vector3(28.438969076366728,18.888756501203087,26.694456000440766), - new THREE.Vector3(-5.369166248035665,2.54925886583683,12.909289954623416) + new THREE.Vector3(24.213548666073923,19.67561630411922,-34.50857509027397), + new THREE.Vector3(35.82557966946029,-3.7247748037464845,-4.21695195820471) ) ); @@ -428,50 +428,45 @@ L3D.createWhompRecommendations = function(width, height) { recos.push( createRecommendation( - new THREE.Vector3(-5.4336754204569345,3.1392444908865986,-2.5523620854280967), - new THREE.Vector3(-5.284005453263061, 2.9591143163290674, 1.440776031533807) + new THREE.Vector3(-9.183036772081453,3.0766349039394916,-10.631680881366988), + new THREE.Vector3(23.306020365359252,-17.647069934844886,0.09162197153512075) ), createRecommendation( - new THREE.Vector3(-6.1753139246999424,3.1460450777755153, 8.89776989593906), - new THREE.Vector3(-2.7026837603414037,3.365743354536376, 6.924809579871983) + new THREE.Vector3(-11.38099373489364,4.5301496570861906,-8.680448599715064), + new THREE.Vector3(14.218919789700848,-9.33335658285769,18.75033014002037) ), createRecommendation( - new THREE.Vector3(-5.4975217973818246,7.726911253355844, 2.805487210952553), - new THREE.Vector3(-2.262483559754942, 5.4847179687372005, 2.0933798626524435) + new THREE.Vector3(-2.989815984700766,4.808626217924975,-10.034026966216151), + new THREE.Vector3(10.476586340125928,-16.676909597940817,20.90183828968142) ), createRecommendation( - new THREE.Vector3(767.5978415761134, 3.641765617950047, -6.734909128840316), - new THREE.Vector3(800.1643232028776, 2.192334600043356, -3.0210038861375168) + new THREE.Vector3(8.739544533019469,4.57426117700506,-10.246457362075027), + new THREE.Vector3(-7.420839007222124,-3.599225856368915,25.419157921381895) ), createRecommendation( - new THREE.Vector3(-4.521868295112849, 4.598285007581405, -7.186164895937964), - new THREE.Vector3(-1.2890361546656827,2.964335244044779, -5.489401941978159) + new THREE.Vector3(11.215995865644405,5.100092599462174,5.157320142222007), + new THREE.Vector3(-17.739835597264776,-0.18398638725505378,-21.92843872759245) ), createRecommendation( - new THREE.Vector3(7.669185389234946,3.470810613964853,-7.254996785427332), - new THREE.Vector3(11.103044107444248,-8.414196017364398,30.78386796730468) + new THREE.Vector3(-7.511384733151988,6.569117611729606,13.141669794236272), + new THREE.Vector3(11.160164249947218,-9.709441800002363,-18.26504544391685) ), createRecommendation( - new THREE.Vector3(-5.00642950829277,7.5887626003253095,-5.785306379113327), - new THREE.Vector3(30.922081744183423,1.5447833064028265,10.725671589357493) + new THREE.Vector3(0.6846182375474082,13.717750177060871,-3.878598405225172), + new THREE.Vector3(14.749877291524962,-2.4709024675402205,29.886709431324352) ), createRecommendation( - new THREE.Vector3(10.73348160390988,7.384861575888838,-5.156956944727774), - new THREE.Vector3(-17.904597948771446,1.3408822819663548,22.107135078094704) + new THREE.Vector3(-5.628153398727744,10.292624364958618,-0.15423059405658932), + new THREE.Vector3(21.830921092510273,-1.2953399806023977,26.523818630177338) ), createRecommendation( - new THREE.Vector3(6.571383420547652,6.592495890455599,8.530692470963302), - new THREE.Vector3(-17.04673536396069,6.525278678835147,-23.752119471730232) + new THREE.Vector3(-3.2817952119549387,8.014848779391615,-6.822708271111021), + new THREE.Vector3(13.01307852868053,-12.339101451861252,23.511988031315184) ), createRecommendation( - new THREE.Vector3(-2.658378348430724,9.934059833300438,4.832483419920441), - new THREE.Vector3(31.687909225501116,1.921420479172772,-14.038927244612823) - ), - createRecommendation( - new THREE.Vector3(0.32263636932421563,14.77110426329107,-4.846281929349468), - new THREE.Vector3(13.444429209246985,-2.688018079059324,28.664874417470223) + new THREE.Vector3(7.805400745480024,9.185305503970957,11.919240783005307), + new THREE.Vector3(-9.777424733344784,-5.603738432878275,-20.8241314870455) ) - ); recos.forEach(function(reco) {reco.setSize(0.2);}); @@ -567,52 +562,48 @@ L3D.createMountainRecommendations = function(width, height) { recos.push( createRecommendation( - new THREE.Vector3(6.390950470631724,17.280677948120072,-10.027673035476619), - new THREE.Vector3(3.407145269707846,3.751012364771242,27.496253407869986) + new THREE.Vector3(-32.55470573684094,29.55322138048939,-17.59574199842915), + new THREE.Vector3(-2.6530082773148784,13.825746134447998,3.8176886333992925) ), createRecommendation( - new THREE.Vector3(1.8218030281265742,12.868464705566172,23.225042509186405), - new THREE.Vector3(-35.819191507045865,-0.6612008777826581,22.903049332448994) + new THREE.Vector3(12.100158831224025,26.077021046580555,-23.46706423961512), + new THREE.Vector3(-13.67308964482135,11.574392013301521,3.4664356093669397) ), createRecommendation( - new THREE.Vector3(-16.540494685269973,13.110251646113246,22.542769963619342), - new THREE.Vector3(-27.881799604553773,-2.2838398465862237,-12.59121287126898) + new THREE.Vector3(16.801072439731502,20.09189357317027,14.011145351254608), + new THREE.Vector3(-13.195470192683612,-4.443428210365667,4.1002717732066145) ), createRecommendation( - new THREE.Vector3(-22.09255502589394,7.505905597711714,-15.23412829383532), - new THREE.Vector3(14.823279525934556,-4.1255169584417315,-5.138031589552474) + new THREE.Vector3(-16.879597154353956,28.027328987174787,23.2120994633039), + new THREE.Vector3(-6.922498345966725,7.02598138495819,-9.342463691665415) ), createRecommendation( - new THREE.Vector3(-21.665778251110755,4.241815926756635,40.76683432842355), - new THREE.Vector3(2.62922954212112,-7.389606629396811,11.19552043054259) + new THREE.Vector3(24.007103291390404,-10.579535956547192,-30.14734612569218), + new THREE.Vector3(5.7117612503958135,-23.76440846717267,2.8895967789043198) ), createRecommendation( - new THREE.Vector3(14.384899444452842,4.759647095537105,30.122662109900055), - new THREE.Vector3(25.246471433793317,-6.871775460616339,-6.575243324069596) + new THREE.Vector3(-12.257327932010769,-12.526038797341444,-36.05191812094985), + new THREE.Vector3(0.19983861525745894,-20.375474197075437,1.1395508675026633) ), createRecommendation( - new THREE.Vector3(20.6728438093429,-14.408979127185429,18.889993476410144), - new THREE.Vector3(-13.929780518638935,-26.04040168333887,35.241397053374556) + new THREE.Vector3(16.426221516558684,4.064315972012067,-19.84262328062327), + new THREE.Vector3(-16.71831968665397,-6.887503610208118,-0.3106741646994493) ), createRecommendation( - new THREE.Vector3(-26.825730322260814,-17.21406097233303,33.188195206615795), - new THREE.Vector3(-12.326126408723896,-17.015972902810617,-4.090783420316271) + new THREE.Vector3(44.96685545730114,-6.205815468014633,-0.5730193999373548), + new THREE.Vector3(7.154826082461277,-13.661034435943513,10.135395267812534) ), createRecommendation( - new THREE.Vector3(-41.2311561559715,-11.714721125315961,2.070220579408691), - new THREE.Vector3(-2.2066012462800373,-15.510910369724881,9.986852522420207) + new THREE.Vector3(-33.00196818869413,20.41721604790279,38.566026084656386), + new THREE.Vector3(-11.64931778228043,-1.846673249080439,13.102649364489118) ), createRecommendation( - new THREE.Vector3(24.92926976320075,-11.374119469227288,-21.440813349326792), - new THREE.Vector3(-7.328902834025087,-24.90378505257612,-2.040853300647978) + new THREE.Vector3(-53.183958472088925,-8.39869666868559,28.102017801758063), + new THREE.Vector3(-15.679778341058253,-11.462793205152831,14.53559656716515) ), createRecommendation( - new THREE.Vector3(-18.733128013636136,-12.129585933653297,-31.983290996466735), - new THREE.Vector3(-1.6636179852017818,-25.659251517002126,1.566373332583197) - ), - createRecommendation( - new THREE.Vector3(-20.627345017019206,22.028686074349515,20.541790520954777), - new THREE.Vector3(14.150384161446272,11.731784408247087,3.6751557271398525) + new THREE.Vector3(27.528666741865862,-9.63536430265764,46.43021804402408), + new THREE.Vector3(1.1519844626168592,-18.896564555304533,17.820765028981576) ) ); diff --git a/utils/demon.sh b/utils/demon.sh index e370791..938a212 100755 --- a/utils/demon.sh +++ b/utils/demon.sh @@ -39,8 +39,6 @@ inotifywait -r -e close_write -m . | cd .. nodemon server.js & -echo "ok" - function killit { killall inotifywait