bugs
This commit is contained in:
@@ -115,9 +115,10 @@ class GameObjectsManager{
|
|||||||
* @param {File} thumbSrc A thumbnail, представително изображение
|
* @param {File} thumbSrc A thumbnail, представително изображение
|
||||||
*/
|
*/
|
||||||
this.addThumb = async function(object, thumbSrc){
|
this.addThumb = async function(object, thumbSrc){
|
||||||
let ext = path.extname(object.asset.ofn).toLowerCase();
|
let ext = path.extname(thumbSrc).toLowerCase();
|
||||||
|
console.log(object, thumbSrc, ext);
|
||||||
let dest = `${config.fs.repo}/thumb/${object.id}.webp`;
|
let dest = `${config.fs.repo}/thumb/${object.id}.webp`;
|
||||||
if (['.jpg', '.png', '.webp'].includes(ext)){
|
if (['.jpg', '.png', '.webp'].includes(ext) || !ext){
|
||||||
await sharp(thumbSrc).resize({height: 250}).toFile(dest);
|
await sharp(thumbSrc).resize({height: 250}).toFile(dest);
|
||||||
}else if (['.mp4', '.avi', '.webv'].includes(ext)){
|
}else if (['.mp4', '.avi', '.webv'].includes(ext)){
|
||||||
let frame = 1;
|
let frame = 1;
|
||||||
|
|||||||
@@ -19,13 +19,17 @@ import { GameEngine } from '@/lib/gameEngine.js';
|
|||||||
let gameEngine = null;
|
let gameEngine = null;
|
||||||
|
|
||||||
export default{
|
export default{
|
||||||
props:['object', 'autoplay'],
|
props:{
|
||||||
|
object: Object,
|
||||||
|
autoplay: Boolean
|
||||||
|
},
|
||||||
data(){
|
data(){
|
||||||
return {
|
return {
|
||||||
animations: []
|
animations: []
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
async mounted(){
|
async mounted(){
|
||||||
|
console.log('mounted')
|
||||||
gameEngine = new GameEngine();
|
gameEngine = new GameEngine();
|
||||||
this.gameEngine = gameEngine;
|
this.gameEngine = gameEngine;
|
||||||
await gameEngine.init(this.$refs.target);
|
await gameEngine.init(this.$refs.target);
|
||||||
@@ -41,7 +45,9 @@ export default{
|
|||||||
},
|
},
|
||||||
methods:{
|
methods:{
|
||||||
async loadAsset() {
|
async loadAsset() {
|
||||||
|
console.log('loading asset');
|
||||||
if (this.forRendering) {
|
if (this.forRendering) {
|
||||||
|
console.log('loading preview');
|
||||||
gameEngine.scene.clear();
|
gameEngine.scene.clear();
|
||||||
if (this.object.type == 'panorama2d') {
|
if (this.object.type == 'panorama2d') {
|
||||||
let t = await gameEngine.loadTexture(`/asset/default/${this.object.asset.name}`);
|
let t = await gameEngine.loadTexture(`/asset/default/${this.object.asset.name}`);
|
||||||
|
|||||||
@@ -59,11 +59,12 @@ class GameEngine {
|
|||||||
domNode.appendChild(renderer.domElement);
|
domNode.appendChild(renderer.domElement);
|
||||||
|
|
||||||
let texture = await this.loadTexture('/static/textures/bck.webp');
|
let texture = await this.loadTexture('/static/textures/bck.webp');
|
||||||
let bck = await this.loadTexture('/static/textures/bck.webp');
|
// let bck = await this.loadTexture('/static/textures/bck.webp');
|
||||||
bck.premultiplyAlpha = true;
|
// bck.premultiplyAlpha = true;
|
||||||
texture.mapping = THREE.EquirectangularReflectionMapping;
|
texture.mapping = THREE.EquirectangularReflectionMapping;
|
||||||
scene.background = bck; //new THREE.Color(0.7,0.7,0.7);
|
// scene.background = bck; //new THREE.Color(0.7,0.7,0.7);
|
||||||
scene.environment = texture;
|
scene.environment = texture;
|
||||||
|
scene.background = new THREE.Color(1,1,1);
|
||||||
console.log('GameEngine started')
|
console.log('GameEngine started')
|
||||||
renderer.domElement.addEventListener('wheel', (event)=>{
|
renderer.domElement.addEventListener('wheel', (event)=>{
|
||||||
camera.zoom -= event.deltaY / 1000;
|
camera.zoom -= event.deltaY / 1000;
|
||||||
|
|||||||
@@ -18,8 +18,8 @@
|
|||||||
</v-card-actions>
|
</v-card-actions>
|
||||||
</v-card>
|
</v-card>
|
||||||
|
|
||||||
<v-card :title="$l.preview" class="container my-3" v-show="object.asset">
|
<v-card :title="$l.preview" class="container my-3" v-if="object.asset">
|
||||||
<AssetPreview :object="object" ref="assetPreview" autoplay></AssetPreview>
|
<AssetPreview :object="object" ref="assetPreview" ></AssetPreview>
|
||||||
<v-card-actions>
|
<v-card-actions>
|
||||||
<v-btn @click="captureThumbnail" v-if="forRendering" prepend-icon="mdi-camera" color="secondary">
|
<v-btn @click="captureThumbnail" v-if="forRendering" prepend-icon="mdi-camera" color="secondary">
|
||||||
{{ $l.captureThumbnail }}
|
{{ $l.captureThumbnail }}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
</v-card>
|
</v-card>
|
||||||
</v-dialog>
|
</v-dialog>
|
||||||
<v-dialog v-model="previewDialog" width="auto" max-width="1200">
|
<v-dialog v-model="previewDialog" width="auto" max-width="1200">
|
||||||
<AssetPreview :object="previewObject"></AssetPreview>
|
<AssetPreview :object="previewObject" autoplay></AssetPreview>
|
||||||
</v-dialog>
|
</v-dialog>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user