Commit b4d09792 authored by Jean Rabreau's avatar Jean Rabreau
Browse files

馃攢Merge branch 'release/1.0.3'

parents 84a3292f 48c35237
Pipeline #61663 passed with stages
in 4 minutes and 9 seconds
NODE_ENV=production
VUE_APP_NAME=pount
VUE_APP_LOGO=https://gitlab.com/uploads/-/system/project/avatar/18299282/pount-front-neunoeuil.png
VUE_APP_AXIOS_BASE_URL=http://localhost:8000/api/
VUE_APP_URL=http://localhost:8080
VUE_APP_AXIOS_BASE_URL=http://pount-local.unistra.fr:8000/api/
NODE_ENV=production
VUE_APP_NAME=pount
VUE_APP_LOGO=https://gitlab.com/uploads/-/system/project/avatar/18299282/pount-front-neunoeuil.png
VUE_APP_URL=https://pount-pprd.app.unistra.fr
VUE_APP_AXIOS_BASE_URL=https://pount-api-pprd.app.unistra.fr/api/
VUE_APP_SENTRY_TAG=preprod
VUE_APP_MATOMO_SERVER=https://webomat-pprd.unistra.fr
......
NODE_ENV=production
VUE_APP_NAME=pount
VUE_APP_LOGO=https://gitlab.com/uploads/-/system/project/avatar/18299282/pount-front-neunoeuil.png
VUE_APP_URL=https://pount.unistra.fr
VUE_APP_AXIOS_BASE_URL=https://pount-api.unistra.fr/api/
VUE_APP_SENTRY_TAG=prod
VUE_APP_MATOMO_SERVER=https://webomat.unistra.fr
......
NODE_ENV=production
VUE_APP_NAME=pount
VUE_APP_LOGO=https://gitlab.com/uploads/-/system/project/avatar/18299282/pount-front-neunoeuil.png
VUE_APP_URL=https://pount-test.app.unistra.fr
VUE_APP_AXIOS_BASE_URL=https://pount-api-test.app.unistra.fr/api/
......@@ -16,11 +16,11 @@ WORKING_DIR="$TEMP/git-clone"
DEST_PATH="/var/www/static/pount-app"
# Shall we install ningx config files ?
SETUP_NGINX=true
SETUP_NGINX=false
# Shall we use sentry ?
# if so sentry-cli is required !!!!
USE_SENTRY=false
USE_SENTRY=true
TEST_HOSTS=("root@django-test2.di.unistra.fr")
TEST_NGINX_CONF="pount-test.app.unistra.fr"
......
This diff is collapsed.
......@@ -18,7 +18,7 @@
"https://medium.com/sapioit/why-having-3-numbers-in-the-version-name-is-bad-92fc1f6bc73c",
"https://gist.github.com/jashkenas/cbd2b088e20279ae2c8e"
],
"version": "1.0.2",
"version": "1.0.3",
"@comment private": [
"This whole project is just documentation.",
"Don't publish it in npm as is."
......@@ -88,22 +88,23 @@
]
},
"dependencies": {
"@sentry/browser": "^6.2.3",
"@sentry/integrations": "^6.2.3",
"@vue-unistra/formbuilder": "^3.0.3",
"axios": "^0.21.1",
"core-js": "^3.9.1",
"jdenticon": "^3.1.0",
"@sentry/browser": "^6.13.2",
"@sentry/integrations": "^6.13.2",
"@vue-unistra/formbuilder": "^3.0.19",
"axios": "^0.21.4",
"core-js": "^3.18.1",
"hammerjs": "^2.0.8",
"jdenticon": "^3.1.1",
"jquery": "^3.6.0",
"jquery-ui": "^1.12.1",
"lodash": "^4.17.21",
"tiptap-vuetify": "^2.24.0",
"vue": "^2.6.12",
"vue-i18n": "^8.24.2",
"vue-matomo": "^3.14.0-0",
"vue-router": "^3.5.1",
"vue": "^2.6.14",
"vue-i18n": "^8.26.5",
"vue-matomo": "^4.1.0",
"vue-router": "^3.5.2",
"vuejs-logger": "^1.5.5",
"vuetify": "^2.4.8",
"vuetify": "^2.5.9",
"vuex": "^3.6.2"
},
"@comment devDependencies": {
......@@ -194,30 +195,30 @@
]
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.5.12",
"@vue/cli-plugin-e2e-nightwatch": "^4.5.12",
"@vue/cli-plugin-eslint": "^4.5.12",
"@vue/cli-plugin-unit-mocha": "^4.5.12",
"@vue/cli-plugin-vuex": "^4.5.12",
"@vue/cli-service": "^4.5.12",
"@vue/test-utils": "^1.1.3",
"@vue/cli-plugin-babel": "^4.5.13",
"@vue/cli-plugin-e2e-nightwatch": "^4.5.13",
"@vue/cli-plugin-eslint": "^4.5.13",
"@vue/cli-plugin-unit-mocha": "^4.5.13",
"@vue/cli-plugin-vuex": "^4.5.13",
"@vue/cli-service": "^4.5.13",
"@vue/test-utils": "^1.2.2",
"babel-eslint": "^10.0.3",
"babel-plugin-istanbul": "^6.0.0",
"chai": "^4.3.4",
"chromedriver": "^89.0.0",
"chromedriver": "^93.0.1",
"eslint": "^6.8.0",
"eslint-plugin-vue": "^7.8.0",
"geckodriver": "^1.22.2",
"eslint-plugin-vue": "^7.18.0",
"geckodriver": "^2.0.4",
"jwt-simple": "^0.5.6",
"moxios": "^0.4.0",
"null-loader": "^4.0.1",
"nyc": "^15.1.0",
"sass": "^1.32.8",
"sass-loader": "<11",
"sinon": "^9.2.4",
"vue-cli-plugin-vuetify": "^2.3.1",
"vue-template-compiler": "^2.6.12",
"vuetify-loader": "^1.7.2",
"webpack-bundle-analyzer": "^4.4.0"
"sass": "~1.32.13",
"sass-loader": "~10.2.0",
"sinon": "^11.1.2",
"vue-cli-plugin-vuetify": "^2.4.2",
"vue-template-compiler": "^2.6.14",
"vuetify-loader": "^1.7.3",
"webpack-bundle-analyzer": "^4.4.2"
}
}
<!DOCTYPE>
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<meta content="charset=UTF-8"/>
<title>3DHOP - 3D Heritage Online Presenter</title>
<!--STYLESHEET-->
<link type="text/css" rel="stylesheet" href="static/stylesheet/vendor/vcg.isti.cnr.it/3dhop.css"/>
<!--SPIDERGL-->
<script type="text/javascript" src="static/js/vendor/vcg.isti.cnr.it/spidergl.js"></script>
<!--JQUERY-->
<script type="text/javascript" src="static/js/vendor/vcg.isti.cnr.it/jquery.js"></script>
<!--PRESENTER-->
<script type="text/javascript" src="static/js/vendor/vcg.isti.cnr.it/presenter.js"></script>
<!--3D MODELS LOADING AND RENDERING-->
<script type="text/javascript" src="static/js/vendor/vcg.isti.cnr.it/nexus.js"></script>
<script type="text/javascript" src="static/js/vendor/vcg.isti.cnr.it/ply.js"></script>
<!--TRACKBALLS-->
<script type="text/javascript" src="static/js/vendor/vcg.isti.cnr.it/trackball_turntable.js"></script>
<script type="text/javascript" src="static/js/vendor/vcg.isti.cnr.it/trackball_turntable_pan.js"></script>
<script type="text/javascript" src="static/js/vendor/vcg.isti.cnr.it/trackball_pantilt.js"></script>
<script type="text/javascript" src="static/js/vendor/vcg.isti.cnr.it/trackball_sphere.js"></script>
<!--UTILITY-->
<script type="text/javascript" src="static/js/vendor/vcg.isti.cnr.it/init.js"></script>
</head>
<body>
<div id="3dhop" class="tdhop" onmousedown="if (event.preventDefault) event.preventDefault()"><div id="tdhlg"></div>
<div id="toolbar">
<img id="home" title="Home" src="static/skins/dark/home.png"/><br/>
<!--ZOOM-->
<img id="zoomin" title="Zoom In" src="static/skins/dark/zoomin.png"/><br/>
<img id="zoomout" title="Zoom Out" src="static/skins/dark/zoomout.png"/><br/>
<!--ZOOM-->
<!--LIGHTING-->
<img id="lighting_off" title="Enable Lighting" src="static/skins/dark/lighting_off.png" style="position:absolute; visibility:hidden;"/>
<img id="lighting" title="Disable Lighting" src="static/skins/dark/lighting.png"/><br/>
<!--LIGHTING-->
<!--LIGHT-->
<img id="light_on" title="Disable Light Control" src="static/skins/dark/lightcontrol_on.png" style="position:absolute; visibility:hidden;"/>
<img id="light" title="Enable Light Control" src="static/skins/dark/lightcontrol.png"/><br/>
<!--LIGHT-->
<!--MEASURE-->
<img id="measure_on" title="Disable Measure Tool" src="static/skins/dark/measure_on.png" style="position:absolute; visibility:hidden;"/>
<img id="measure" title="Enable Measure Tool" src="static/skins/dark/measure.png"/><br/>
<!--MEASURE-->
<!--POINT PICKING-->
<img id="pick_on" title="Disable PickPoint Mode" src="static/skins/dark/pick_on.png" style="position:absolute; visibility:hidden;"/>
<img id="pick" title="Enable PickPoint Mode" src="static/skins/dark/pick.png"/><br/>
<!--POINT PICKING-->
<!--SECTIONS-->
<img id="sections_on" title="Disable Plane Sections" src="static/skins/dark/sections_on.png" style="position:absolute; visibility:hidden;"/>
<img id="sections" title="Enable Plane Sections" src="static/skins/dark/sections.png"/><br/>
<!--SECTIONS-->
<!--COLOR-->
<img id="color_on" title="Disable Solid Color" src="static/skins/dark/color_on.png" style="position:absolute; visibility:hidden;"/>
<img id="color" title="Enable Solid Color" src="static/skins/dark/color.png"/><br/>
<!--COLOR-->
<!--CAMERA-->
<img id="perspective" title="Perspective Camera" src="static/skins/dark/perspective.png" style="position:absolute; visibility:hidden;"/>
<img id="orthographic" title="Orthographic Camera" src="static/skins/dark/orthographic.png"/><br/>
<!--CAMERA-->
<!--SCREENSHOT-->
<img id="screenshot" title="Save Screenshot" src="static/skins/dark/screenshot.png"/><br/>
<!--SCREENSHOT-->
<!--FULLSCREEN-->
<img id="full_on" title="Exit Full Screen" src="static/skins/dark/full_on.png" style="position:absolute; visibility:hidden;"/>
<img id="full" title="Full Screen" src="static/skins/dark/full.png"/>
<!--FULLSCREEN-->
</div>
<!--MEASURE-->
<div id="measure-box" class="output-box">Measured length<hr/><span id="measure-output" class="output-text" onmousedown="event.stopPropagation()">0.0</span></div>
<!--MEASURE-->
<!--POINT PICKING-->
<div id="pickpoint-box" class="output-box">XYZ picked point<hr/><span id="pickpoint-output" class="output-text" onmousedown="event.stopPropagation()">[ 0 , 0 , 0 ]</span></div>
<!--POINT PICKING-->
<!--SECTIONS-->
<div id="sections-box" class="output-box">
<table class="output-table" onmousedown="event.stopPropagation()">
<tr><td>Plane</td><td>Position</td><td>Flip</td></tr>
<tr>
<td><img id="xplane_on" title="Disable X Axis Section" src="static/skins/icons/sectionX_on.png" onclick="sectionxSwitch()" style="position:absolute; visibility:hidden; border:1px inset;"/>
<img id="xplane" title="Enable X Axis Section" src="static/skins/icons/sectionX.png" onclick="sectionxSwitch()"/><br/></td>
<td><input id="xplaneSlider" class="output-input" type="range" title="Move X Axis Section Position"/></td>
<td><input id="xplaneFlip" class="output-input" type="checkbox" title="Flip X Axis Section Direction"/></td></tr>
<tr>
<td><img id="yplane_on" title="Disable Y Axis Section" src="static/skins/icons/sectionY_on.png" onclick="sectionySwitch()" style="position:absolute; visibility:hidden; border:1px inset;"/>
<img id="yplane" title="Enable Y Axis Section" src="static/skins/icons/sectionY.png" onclick="sectionySwitch()"/><br/></td>
<td><input id="yplaneSlider" class="output-input" type="range" title="Move Y Axis Section Position"/></td>
<td><input id="yplaneFlip" class="output-input" type="checkbox" title="Flip Y Axis Section Direction"/></td></tr>
<tr>
<td><img id="zplane_on" title="Disable Z Axis Section" src="static/skins/icons/sectionZ_on.png" onclick="sectionzSwitch()" style="position:absolute; visibility:hidden; border:1px inset;"/>
<img id="zplane" title="Enable Z Axis Section" src="static/skins/icons/sectionZ.png" onclick="sectionzSwitch()"/><br/></td>
<td><input id="zplaneSlider" class="output-input" type="range" title="Move Y Axis Section Position"/></td>
<td><input id="zplaneFlip" class="output-input" type="checkbox" title="Flip Z Axis Section Direction"/></td></tr></table>
<table class="output-table" onmousedown="event.stopPropagation()" style="text-align:right;">
<tr>
<td>Show planes<input id="showPlane" class="output-input" type="checkbox" title="Show Section Planes" style="bottom:-3px;"/></td>
<td>Show edges<input id="showBorder" class="output-input" type="checkbox" title="Show Section Edges" style="bottom:-3px;"/></td></tr></table>
</div>
<!--SECTIONS-->
<canvas id="draw-canvas" style="background-image: url(static/skins/backgrounds/light.jpg)"/>
</div>
</body>
<script type="text/javascript">
var presenter = null;
function setup3dhop(url) {
presenter = new Presenter("draw-canvas");
presenter.setScene({
meshes: {
"mesh_1" : { url } //: "models/gargo.nxz" }
},
modelInstances : {
"model_1" : {
mesh : "mesh_1",
// color : [0.8, 0.7, 0.75]
}
},
trackball: {
type: SphereTrackball,
trackOptions : {
startDistance : 2.5,
minMaxDist: [0, 3.0]
}
}
});
//--MEASURE--
presenter._onEndMeasurement = onEndMeasure;
//--MEASURE--
//--POINT PICKING--
presenter._onEndPickingPoint = onEndPick;
//--POINT PICKING--
//--SECTIONS--
sectiontoolInit();
//--SECTIONS--
}
function actionsToolbar(action) {
if(action=='home') presenter.resetTrackball();
//--FULLSCREEN--
else if(action=='full' || action=='full_on') fullscreenSwitch();
//--FULLSCREEN--
//--ZOOM--
else if(action=='zoomin') presenter.zoomIn();
else if(action=='zoomout') presenter.zoomOut();
//--ZOOM--
//--LIGHTING--
else if(action=='lighting' || action=='lighting_off') { presenter.enableSceneLighting(!presenter.isSceneLightingEnabled()); lightingSwitch(); }
//--LIGHTING--
//--LIGHT--
else if(action=='light' || action=='light_on') { presenter.enableLightTrackball(!presenter.isLightTrackballEnabled()); lightSwitch(); }
//--LIGHT--
//--CAMERA--
else if(action=='perspective' || action=='orthographic') { presenter.toggleCameraType(); cameraSwitch(); }
//--CAMERA--
//--COLOR--
else if(action=='color' || action=='color_on') { presenter.toggleInstanceSolidColor(HOP_ALL, true); colorSwitch(); }
//--COLOR--
//--MEASURE--
else if(action=='measure' || action=='measure_on') { presenter.enableMeasurementTool(!presenter.isMeasurementToolEnabled()); measureSwitch(); }
//--MEASURE--
//--POINT PICKING--
else if(action=='pick' || action=='pick_on') { presenter.enablePickpointMode(!presenter.isPickpointModeEnabled()); pickpointSwitch(); }
//--POINT PICKING--
//--SCREENSHOT--
else if(action=='screenshot') presenter.saveScreenshot();
//--SCREENSHOT--
//--SECTIONS--
else if(action=='sections' || action=='sections_on') { sectiontoolReset(); sectiontoolSwitch(); }
//--SECTIONS--
}
//--MEASURE--
function onEndMeasure(measure) {
// measure.toFixed(2) sets the number of decimals when displaying the measure
// depending on the model measure units, use "mm","m","km" or whatever you have
$('#measure-output').html(measure.toFixed(3) + "m");
}
//--MEASURE--
//--PICKPOINT--
function onEndPick(point) {
// .toFixed(2) sets the number of decimals when displaying the picked point
var x = point[0].toFixed(2);
var y = point[1].toFixed(2);
var z = point[2].toFixed(2);
$('#pickpoint-output').html("[ "+x+" , "+y+" , "+z+" ]");
}
//--PICKPOINT--
$(document).ready(function(){
init3dhop();
const url = window.parent.document.getElementById("frame").getAttribute('data-url')
setup3dhop(url)
});
</script>
</html>
{
"width": 512, "height": 512,
"format": "jpg",
"type":"bilinear",
"resolution": 9,
"colorspace":"mrgb",
"sigma": 0.125,
"lights": [-0.171773, 0.0385296, 0.984383, 0.0967979, 0.15293, 0.983485, 0.214932, -0.104962, 0.970972, -0.0526522, -0.220291, 0.974012, -0.384994, 0.040688, 0.922022, -0.174243, 0.256818, 0.950623, 0.0958618, 0.366042, 0.925648, 0.31226, 0.15915, 0.936571, 0.426708, -0.100714, 0.898764, 0.215307, -0.319437, 0.922823, -0.0527857, -0.429843, 0.901359, -0.276425, -0.229269, 0.933287, -0.574001, 0.0462346, 0.817548, -0.390173, 0.26436, 0.881974, -0.175786, 0.462987, 0.868759, 0.094534, 0.559745, 0.823255, 0.313459, 0.374165, 0.872779, 0.5117, 0.165074, 0.843157, 0.602658, -0.0998576, 0.791727, 0.42538, -0.320755, 0.846267, 0.217173, -0.519104, 0.82666, -0.0530371, -0.615835, 0.786088, -0.276414, -0.436319, 0.856283, -0.477792, -0.228021, 0.848364, -0.736724, 0.0477747, 0.674504, -0.586852, 0.271087, 0.762966, -0.39671, 0.479678, 0.782643, -0.173196, 0.651027, 0.739031, 0.0942131, 0.72092, 0.686584, 0.320497, 0.570517, 0.75617, 0.521409, 0.383535, 0.762256, 0.689885, 0.164899, 0.704888, 0.756792, -0.0991573, 0.646091, 0.614656, -0.321809, 0.720164, 0.432194, -0.525327, 0.732966, 0.215615, -0.69734, 0.68354, -0.053858, -0.769345, 0.636559, -0.282786, -0.628143, 0.724892, -0.491386, -0.440974, 0.751054, -0.664807, -0.223246, 0.712877, -0.861363, 0.0562821, 0.504862, -0.756222, 0.277852, 0.592391, -0.597638, 0.488892, 0.635463, -0.402891, 0.664758, 0.629106, -0.184559, 0.799907, 0.57104, 0.092772, 0.850249, 0.518141, 0.320022, 0.741367, 0.589882, 0.527411, 0.585089, 0.616043, 0.700682, 0.392834, 0.595588, 0.82707, 0.179046, 0.532821, 0.875163, -0.0963927, 0.474129, 0.772685, -0.318881, 0.548883, 0.623707, -0.524707, 0.579371, 0.435627, -0.702784, 0.562426, 0.221594, -0.834971, 0.503705, -0.0542863, -0.888256, 0.45613, -0.282391, -0.790101, 0.544055, -0.49599, -0.637183, 0.589908, -0.677003, -0.443224, 0.587554, -0.810782, -0.222843, 0.54127, -0.949445, 0.0653317, 0.307059, -0.878945, 0.286014, 0.381644, -0.758828, 0.49375, 0.424724, -0.59546, 0.675196, 0.435359, -0.398853, 0.817948, 0.414581, -0.18159, 0.912285, 0.367098, 0.0933222, 0.940086, 0.327917, 0.317304, 0.868094, 0.381747, 0.523435, 0.74784, 0.408351, 0.701378, 0.58378, 0.408986, 0.838799, 0.389301, 0.380606, 0.929501, 0.17418, 0.3251, 0.953939, -0.0954734, 0.284402, 0.887418, -0.313777, 0.337689, 0.773389, -0.516843, 0.367073, 0.617679, -0.694422, 0.369122, 0.42697, -0.835684, 0.345439, 0.215676, -0.931762, 0.292066, -0.0567725, -0.964445, 0.258113, -0.281215, -0.903062, 0.324649, -0.493637, -0.788958, 0.36588, -0.677954, -0.625945, 0.38545, -0.822378, -0.429781, 0.372804, -0.91835, -0.213481, 0.333256, -0.992368, 0.0734949, 0.0990125, -0.948671, 0.280383, 0.146315, -0.862835, 0.47601, 0.170089, -0.730098, 0.658257, 0.183454, -0.567025, 0.802423, 0.186011, -0.376326, 0.910669, 0.170471, -0.171457, 0.974587, 0.144159, 0.0913145, 0.988486, 0.120649, 0.301725, 0.941775, 0.148397, 0.500294, 0.850429, 0.162719, 0.674062, 0.72, 0.165048, 0.815554, 0.558186, 0.152643, 0.920332, 0.368482, 0.131184, 0.980941, 0.164411, 0.103558, 0.992693, -0.0912323, 0.0789762, 0.948936, -0.297515, 0.104911, 0.863629, -0.489958, 0.118684, 0.740315, -0.660994, 0.122564, 0.584938, -0.803388, 0.111425, 0.403144, -0.910391, 0.0930754, 0.202963, -0.977261, 0.0613796, -0.0570689, -0.997403, 0.0439353, -0.269311, -0.959993, 0.0767125, -0.471253, -0.875916, 0.103402, -0.650551, -0.750305, 0.11758, -0.79823, -0.589093, 0.125692, -0.909363, -0.39774, 0.121909, -0.977448, -0.186935, 0.0982417, -0.0607962, 0.14795, 0.987124, 0.204547, 0.0490648, 0.977626, 0.10313, -0.212702, 0.971659, -0.163284, -0.114975, 0.979857],
"nplanes": 18,
"materials": [
{
"range": [778.583,813.847,947.854,625.645,986.521,593.483,705.601,609.348,630.541,632.438,404.818,555.93,642.429,604.455,418.692,463.45,420.918,496.591],
"scale": [7.29822,7.29822,7.29822,7.29822,7.29822,7.29822,7.29822,7.29822,7.29822,7.29822,7.29822,7.29822,7.29822,7.29822,7.29822,7.29822,7.29822,7.29822],
"bias": [0.551902,0.461436,0.436352,0.405736,0.315653,0.265878,0.196288,0.173859,0.168107,0.213515,0.21325,0.178044,0.146861,0.162062,0.147492,0.113712,0.11379,0.145186] }
]
}
<html lang="en" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="description" content="WebRTIViewer is a simple viewer for high resolution RTI images" />
<meta name="keywords" content="WebGL, Library, JavaScript, 3D, OpenGL, 2D, Graphics, Rendering, Realtime, Real-time, SpiderGL, VCG, RTI" />
<title>RTI-Viewer</title>
<link type="text/css" href="static/stylesheet/vendor/vcg.isti.cnr.it/ui-lightness/jquery-ui-1.10.3.custom.css" rel="Stylesheet">
<link type="text/css" href="static/stylesheet/vendor/vcg.isti.cnr.it/webrtiviewer.css" rel="Stylesheet">
<script type="text/javascript" src="static/js/jquery-1.11.3.min.js"></script>
<script type="text/javascript" src="static/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="static/js/pep.min.js"></script>
<script type="text/javascript" src="spidergl/spidergl.min.js"></script>
<script type="text/javascript" src="spidergl/multires.min.js"></script>
</head>
<body>
<div id="viewerCont">
<script type="text/javascript">
const url = window.parent.document.getElementById("frame").getAttribute('data-url')
$(document).ready(function() {
createRtiViewer("viewerCont", url, 900, 600);
})
</script>
</div>
</body>
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment