From 4e0de68fb6fdb5fbfd29c910325fb824e857cbb2 Mon Sep 17 00:00:00 2001 From: tonkia Date: Tue, 25 Dec 2018 19:15:36 +0800 Subject: [PATCH] home crop picture and fix some mistakes --- app.js | 18 +++- static/img/webbg.jpg | Bin 4780 -> 15125 bytes static/js/createScheme.js | 196 ++++++++++++++++++++++++-------------- views/createScheme.html | 23 ++++- views/home.html | 2 +- 5 files changed, 162 insertions(+), 77 deletions(-) diff --git a/app.js b/app.js index 0a7c118..c33b133 100644 --- a/app.js +++ b/app.js @@ -162,8 +162,12 @@ app.post('/saveScheme', function (req, res) { //------------------------------------------------------------------------------------------------ //获取初始方案 app.post('/getScheme', function (req, res) { - var data = { name: '默认方案', components: [], img: null, id: null }; - res.send(data); + var data = { name: '默认方案', components: [], img: null, id: null, maxHeight: 10, height: 2, maxDistance: 30, distance: 10 }; + replyData = { + msg: 0, + data: data + } + res.send(replyData); }); //根据局ID获取初始方案 @@ -175,9 +179,17 @@ app.post('/getScheme/:id', function (req, res) { if (row.length > 0) { var data = JSON.parse(row[0].data); data.id = id; - res.send(data); + replyData = { + msg: 0, + data: data + } + res.send(replyData); } else { //TODO 找不到方案 + replyData = { + msg: 1 + } + res.send(replyData); } }) } else { diff --git a/static/img/webbg.jpg b/static/img/webbg.jpg index 18d83c063d8fefd00f8f76faf6b77fda03203de8..cc62d499e27adb374897853b84e16b2c56fbf8c4 100644 GIT binary patch literal 15125 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 0 && textureIndex >= 0) - replaceTexture(data.components[comIndex].models[modelIndex].modelObj, data.components[comIndex].textures[textureIndex].textureObj); - } + for (var comIndex in data.components) { + var modelIndex = data.components[comIndex].modelIndex; + var textureIndex = data.components[comIndex].textureIndex; + //赋贴图 + if (data.components[comIndex].models.length > 0 && data.components[comIndex].textures.length > 0) + replaceTexture(data.components[comIndex].models[modelIndex].modelObj, data.components[comIndex].textures[textureIndex].textureObj); } } + //--------------------------------------------------------------------------------------------------------------------- //初始化所有事件 function initEvent() { @@ -323,42 +326,63 @@ function initEvent() { //复制一个saveData var saveData = {}; $.extend(saveData, data); - //去除aveData中多余的数据 - for (var index in saveData.components) { - for (textureIndex in saveData.components[index].textures) { - delete saveData.components[index].textures[textureIndex].textureObj; - } - for (modelIndex in saveData.components[index].models) { - delete saveData.components[index].models[modelIndex].modelObj; - } - } //生成缩略图 + var imgData = renderer.domElement.toDataURL("image/jpeg");//这里可以选择png格式jpeg格式 + var image = new Image(); - let imgData = renderer.domElement.toDataURL("image/jpeg");//这里可以选择png格式jpeg格式 - saveData.img = imgData; - //上传服务器 - $.ajax({ - type: "POST", - url: "/saveScheme", - contentType: "application/json; charset=utf-8", - data: JSON.stringify(saveData), - success: function (returnData) { - console.info(returnData); - if (returnData.affectedRows > 0) { - //获取保存后的id - if (returnData.insertId) - data.id = returnData.insertId; - new $.zui.Messager('保存成功！', { - type: 'success', - close: false, - actions: [{ - icon: 'times', - text: '确定' - }] - }).show(); + image.src = imgData; + //异步 + image.onload = function () { + var sWidth = image.width; + var sHeigth = image.height; + var tWidth = sHeigth / 1.2; + var tHeigth = sHeigth; + //压缩后的像素 + $('#compress')[0].width = 200; + $('#compress')[0].height = 240; + //console.info(sWidth + ":" + sHeigth + ":" + tWidth + ":" + tHeigth); + //压缩图片 + $('#compress')[0].getContext('2d').drawImage(image, (sWidth - tWidth) / 2, (sHeigth - tHeigth) / 2, tWidth, tHeigth, 0, 0, $('#compress')[0].width, $('#compress')[0].height); + imgData = $('#compress')[0].toDataURL("image/jpeg", 0.5); + + saveData.img = imgData; + //去除多余数据 + var sendData = JSON.stringify(saveData, function (key, value) { + if (key == 'textureObj' || key == 'modelObj') { + return null; + } else { + return value; } - } - }); + }) + // console.info(data); + // console.info(saveData); + // console.info(sendData); + //上传服务器 + $.ajax({ + type: "POST", + url: "/saveScheme", + contentType: "application/json; charset=utf-8", + data: sendData, + success: function (returnData) { + // console.info(returnData); + if (returnData.affectedRows > 0) { + //获取保存后的id + if (returnData.insertId) + data.id = returnData.insertId; + new $.zui.Messager('保存成功！', { + type: 'success', + close: false, + actions: [{ + icon: 'times', + text: '确定' + }] + }).show(); + } + } + }); + }; + + }); //方案名变动监听 @@ -503,6 +527,34 @@ function initEvent() { $('#textureManagerment').click(function () { $('#textureManagermentModal').modal('show'); }); + + //相机高度控制 + $('#cameraHeight').mousemove(function () { + var height = data.maxHeight / 100 * $('#cameraHeight').val(); + data.height = parseFloat(height.toFixed(2)); + $('#cameraHeightValue').text(data.height); + camera.position.y = data.height + controls.target.set(0, data.height, 0); + controls.update(); + }); + + //相机距离控制 + $('#cameraDistance').mousemove(function () { + distance = data.maxDistance / 100 * $('#cameraDistance').val(); + data.distance = parseFloat(distance.toFixed(2)); + $('#cameraDistanceValue').text(data.distance); + controls.minDistance = data.distance; + controls.maxDistance = data.distance; + controls.update(); + }); + + $('#cameraHeightMaxValue').change(function () { + data.maxHeight = parseFloat($('#cameraHeightMaxValue').val()); + }); + + $('#cameraDistanceMaxValue').change(function () { + data.maxDistance = parseFloat($('#cameraDistanceMaxValue').val()); + }); } // 选择上传完成后加载模型 diff --git a/views/createScheme.html b/views/createScheme.html index 59956a9..d0eac49 100644 --- a/views/createScheme.html +++ b/views/createScheme.html @@ -54,11 +54,15 @@ #textureField>img{ margin-top:5px; } - + #cameraConfig>*{ + margin-top:5px; + margin-bottom:5px; + } +
@@ -68,8 +72,23 @@
+
+
+
+
+
+ xx
+ +
+
+ xx
+ +
+
+
+
@@ -174,6 +193,8 @@
+ + diff --git a/views/home.html b/views/home.html index 2b14acd..bd24736 100644 --- a/views/home.html +++ b/views/home.html @@ -86,7 +86,7 @@ var name = data.schemeList[index].name; var img = data.schemeList[index].img; var id = data.schemeList[index].id; - $('#schemeList').append("
" + name + "
" + name + "
"); + $('#schemeList').append("
" + name + "
" + name + "
"); } }); }