|
|
@@ -6,10 +6,6 @@ const playVideoWhenFlyOut = false;
|
|
|
const playVideoMax = window.isEdit ? 3 : browser.isMobile() ? 1 : 3;
|
|
|
const playAniMax = window.isEdit ? 6 : browser.isMobile() ? 3 : 5;
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
window.initHot = function (model) {
|
|
|
var objLoader = new THREE.OBJLoader();
|
|
|
var _planeGeometry = new THREE.PlaneGeometry(1, 1);
|
|
|
@@ -54,9 +50,8 @@ window.initHot = function (model) {
|
|
|
o = "en" == manage.number("lang") ? "&lang=" + manage.number("lang") : "";
|
|
|
-1 == r.indexOf("?") ? (src = link + "?time=" + randomTime().getTime() + "&id=" + window.number + o) : (src = link + "&time=" + randomTime().getTime() + "&id=" + window.number + o);
|
|
|
|
|
|
-
|
|
|
if (window.project_env && window.project_env == "development") {
|
|
|
- return src.replace("https://www.4dmodel.com/SuperTwo/hot_online1", "http://192.168.0.18:8089");
|
|
|
+ return src.replace("https://www.4dmodel.com/SuperTwo/hot_online1", "http://192.168.0.78:8089");
|
|
|
} else {
|
|
|
return src.replace("https://www.4dmodel.com/SuperTwo/hot_online1", "hot");
|
|
|
}
|
|
|
@@ -634,13 +629,7 @@ window.initHot = function (model) {
|
|
|
var cornerPoint;
|
|
|
|
|
|
if (this.plane) {
|
|
|
- cornerPoint = [
|
|
|
- new THREE.Vector3(0, 0, depth),
|
|
|
- new THREE.Vector3(-width / 2, height / 2, depth),
|
|
|
- new THREE.Vector3(width / 2, height / 2, depth),
|
|
|
- new THREE.Vector3(width / 2, -height / 2, depth),
|
|
|
- new THREE.Vector3(-width / 2, -height / 2, depth),
|
|
|
- ];
|
|
|
+ cornerPoint = [new THREE.Vector3(0, 0, depth), new THREE.Vector3(-width / 2, height / 2, depth), new THREE.Vector3(width / 2, height / 2, depth), new THREE.Vector3(width / 2, -height / 2, depth), new THREE.Vector3(-width / 2, -height / 2, depth)];
|
|
|
} else {
|
|
|
var bound = new THREE.Box3().copy(this.info.modelBound.bound);
|
|
|
var center = bound.center();
|
|
|
@@ -737,10 +726,7 @@ window.initHot = function (model) {
|
|
|
return convertTool.updateVisible(this, "visi", true);
|
|
|
}
|
|
|
|
|
|
- let visible =
|
|
|
- visibility != void 0
|
|
|
- ? visibility
|
|
|
- : !this.info.visiblePanos || (type == "every" ? panos.every((pano) => this.info.visiblePanos.includes(pano.id)) : panos.some((pano) => this.info.visiblePanos.includes(pano.id))); //type为every时，需要panos中每个都可见才显示
|
|
|
+ let visible = visibility != void 0 ? visibility : !this.info.visiblePanos || (type == "every" ? panos.every((pano) => this.info.visiblePanos.includes(pano.id)) : panos.some((pano) => this.info.visiblePanos.includes(pano.id))); //type为every时，需要panos中每个都可见才显示
|
|
|
|
|
|
convertTool.updateVisible(this, "visi", visible);
|
|
|
|
|
|
@@ -934,7 +920,7 @@ window.initHot = function (model) {
|
|
|
|
|
|
updateScale(e, t) {
|
|
|
//自适应调节大小 原先的shine改为了photo的动画
|
|
|
- if (!DATA.autoAdjustHotScale || /* this.texType != "shine" */ this.texType != "photo" || !this.plane) return;
|
|
|
+ if (!DATA.autoAdjustHotScale || /* this.texType != "shine" */ this.texType != "photo" || !this.plane) return;
|
|
|
|
|
|
var scale = convertTool.getScaleForConstantSize(
|
|
|
$.extend({}, autoSizeInfo, {
|
|
|
@@ -1230,9 +1216,7 @@ window.initHot = function (model) {
|
|
|
setTimeout(function e() {
|
|
|
if (s) {
|
|
|
var t = document.querySelector("#id1").contentWindow.document;
|
|
|
- t.querySelector("video") &&
|
|
|
- (t.querySelector("video").play(), !t.querySelector("video").paused && t.querySelector(".playPause") && t.querySelector(".playPause").classList.add("fa-pause")),
|
|
|
- t.querySelector("audio") && t.querySelector("audio").play();
|
|
|
+ t.querySelector("video") && (t.querySelector("video").play(), !t.querySelector("video").paused && t.querySelector(".playPause") && t.querySelector(".playPause").classList.add("fa-pause")), t.querySelector("audio") && t.querySelector("audio").play();
|
|
|
} else setTimeout(e, 300);
|
|
|
}, 800);
|
|
|
}
|
lanxin
