Browse Source

修改需求

bill 3 years ago
parent
commit
e16081adab
3 changed files with 11 additions and 8 deletions
  1. 6 3
      src/sdk/association.ts
  2. 1 1
      src/views/guide/edit-paths.vue
  3. 4 4
      src/views/merge/index.vue

+ 6 - 3
src/sdk/association.ts

@@ -37,7 +37,10 @@ const associationModels = (sdk: SDK) => {
       sceneModelMap.set(itemRaw, sceneModel)
 
       sceneModel.bus.on('transformChanged', transform => {
-        Object.assign(item, transform)
+        Object.assign(item, {
+          ...transform,
+          scale: transform.scale ? transform.scale * 100 : item.scale
+        })
       })
       sceneModel.bus.on('changeSelect', select => {
         if (custom.currentModel === item && !select) {
@@ -73,8 +76,8 @@ const associationModels = (sdk: SDK) => {
           watchEffect(() => {
             getSceneModel(item)?.changeBottom(item.bottom)
           })
-          watchEffect(() => getSceneModel(item)?.changeOpacity(item.opacity))
-          watchEffect(() => getSceneModel(item)?.changeScale(item.scale))
+          watchEffect(() => getSceneModel(item)?.changeOpacity(item.opacity / 100))
+          watchEffect(() => getSceneModel(item)?.changeScale(item.scale / 100))
           watchEffect(() => getSceneModel(item)?.changeShow(modelShow.value))
           stopLoadedWatch()
         }

+ 1 - 1
src/views/guide/edit-paths.vue

@@ -19,7 +19,7 @@
     <div class="info" v-if="paths.length">
       <div class="meta">
         <div class="length">
-          <span>视频时长</span>
+          <span>视频时长</span>{{paths.reduce((t, c) => t + c.time, 0)}}s
         </div>
         <div 
           class="fun-ctrl clear" 

+ 4 - 4
src/views/merge/index.vue

@@ -52,15 +52,15 @@ useViewStack(() => {
 })
 const defaultAttrs: ModelAttrs = {
   show: true,
-  scale: 1,
-  opacity: 1,
+  scale: 100,
+  opacity: 100,
   bottom: 0,
   position: {x: 0, y: 0, z: 0},
   rotation: {x: 0, y: 0, z: 0}
 }
-const opacityOption = { min: 0, max: 100, step: 0.01, ctrl: false }
+const opacityOption = { min: 0, max: 100, step: 1, ctrl: false }
 const bottomOption = { min: -30, max: 70, step: 0.1, ctrl: false }
-const scaleOption = { min: 0, max: 200, step: 0.01, ctrl: false }
+const scaleOption = { min: 0, max: 200, step: 1, ctrl: false }
 const actionItems: ActionsProps['items'] = [
   {
     icon: 'move',