|
@@ -345,7 +345,7 @@ EditTools.prototype.initSaveAll = function() {
|
|
|
|
|
|
showHotListSta: $('#hotListSwitch').is(':checked'),
|
|
|
// 开启热点列表
|
|
|
- hotIconScale: DATA.hotIconScale,
|
|
|
+ //hotIconScale: DATA.hotIconScale,
|
|
|
// 热点缩放
|
|
|
supportsVR: $('#VRSwitch input').is(':checked'),
|
|
|
// 开启VR功能
|
|
@@ -653,8 +653,7 @@ SceneInformation.prototype.init = function(data, data2) {
|
|
|
let momentTour = $('#tourSwitch input');
|
|
|
// 导览瞬间过渡开关
|
|
|
let hotListSwitch = $('#hotListSwitch');
|
|
|
- // 热点列表开关
|
|
|
- let hotIconScale = $('#hotIconScale');
|
|
|
+
|
|
|
// 热点图标缩放
|
|
|
let VRSwitch = $('#VRSwitch input');
|
|
|
// VR功能开启
|
|
@@ -715,9 +714,9 @@ SceneInformation.prototype.init = function(data, data2) {
|
|
|
$('#newBlack').prop('checked', true);
|
|
|
}
|
|
|
|
|
|
- if (data.hotIconScale) {
|
|
|
- hotIconScale.val(parseFloat(data.hotIconScale));
|
|
|
- }
|
|
|
+ /* if (data.hotIconScale) {
|
|
|
+ $('#hotIconScale input').val(parseFloat(data.hotIconScale));
|
|
|
+ } */
|
|
|
|
|
|
/* $('#hotIconScale_2 input').on('change',(e)=>{
|
|
|
var s = THREE.Math.clamp(parseFloat(e.target.value), 0.1, 100)
|
|
@@ -1037,7 +1036,7 @@ Hotpoint.prototype.init = function() {
|
|
|
})
|
|
|
}
|
|
|
|
|
|
- {
|
|
|
+ /* {
|
|
|
let ui = $('#hotIconScale input')
|
|
|
let min = parseFloat(ui.attr('min'));
|
|
|
let max = parseFloat(ui.attr('max'));
|
|
@@ -1048,7 +1047,33 @@ Hotpoint.prototype.init = function() {
|
|
|
DATA.hotIconScale = s
|
|
|
})
|
|
|
|
|
|
- }
|
|
|
+ } */
|
|
|
+
|
|
|
+
|
|
|
+ $(".hotpoint [name='adjustSize'] button").on('click',(e)=>{
|
|
|
+ let type = $(e.target).attr('index')
|
|
|
+ var c = 1.1
|
|
|
+ if(type == '-'){
|
|
|
+ s = 1/c
|
|
|
+ }else{
|
|
|
+ s = c
|
|
|
+ }
|
|
|
+ player.model.hotGroup.children.forEach(hot=>{
|
|
|
+ if(hot.texType == 'shine'){
|
|
|
+ hot.info.scale.multiplyScalar(s)
|
|
|
+ hot.scale.multiplyScalar(s)
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+
|
|
|
+ })
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
|
|
|
this.isSpriteCheckBox = new CheckBox({dom: $("#isSprite"),
|
|
|
uiCallBack : (checked)=>{
|
|
@@ -2852,7 +2877,7 @@ Hotpoint.prototype.useSuitableRatio = function(o={}) {//自适应素材比例
|
|
|
if(hot.texType == 'shine'){//默认使用热点大小,正方形
|
|
|
|
|
|
if(o.setScaleAuto){
|
|
|
- w = h = DATA.hotIconScale * g_HotMeshSize.g_HotMeshWidth
|
|
|
+ w = h = 1 //DATA.hotIconScale * g_HotMeshSize.g_HotMeshWidth
|
|
|
}else{
|
|
|
s = hot.scale.x * hot.scale.y
|
|
|
w = h = Math.sqrt(Math.abs(s))
|