v4.3.0 [ci-build]

(Fix issue in collada exporter)
JannisX11 · Jul 22, 2022 · 8bd7faa · 8bd7faa
1 parent 6f57ec1
commit 8bd7faa
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/index.html b/index.html
@@ -26,7 +26,7 @@
  <script>
  if (typeof module === 'object') {window.module = module; module = undefined;}//jQuery Fix
  const isApp = typeof require !== 'undefined';
- const appVersion = '4.3.0-beta.3';
+ const appVersion = '4.3.0';
 
 
  if (localStorage.getItem('theme')) {

diff --git a/js/io/formats/collada.js b/js/io/formats/collada.js
@@ -617,6 +617,9 @@ var codec = new Codec('collada', {
  let track_channel = animators[track.group_uuid][track.channel];
  track_channel.times.push(...track.times.map(t => t + time_offset));
  track_channel.animations_added.push(anim_i);
+
+ let add_keyframe_at_end = track.times[track.times.length-1] - anim_obj.duration <= 0.1;
+ if (add_keyframe_at_end) track_channel.times.push(anim_obj.duration + time_offset);
 
  if (track.channel == 'rotation') {
  if (!track_channel.values) track_channel.values = {};
@@ -626,14 +629,22 @@ var codec = new Codec('collada', {
  return i % 3 == axis_i;
  }).map(v => Math.radToDeg(v));
  track_channel.values[axis].push(...axis_values);
+ if (add_keyframe_at_end) {
+ track_channel.values[axis].push(...track_channel.values[axis].slice(-1));
+ }
  })
  } else {
  if (!track_channel.values) track_channel.values = [];
  track_channel.values.push(...track.values);
+ if (add_keyframe_at_end) {
+ track_channel.values.push(...track_channel.values.slice(-3));
+ }
  }
  })
 
  for (let uuid in animators) {
+ let group = Group.all.find(group => group.uuid == uuid);
+
  for (let channel in animators[uuid]) {
  let track_channel = animators[uuid][channel];
  if (track_channel.animations_added.includes(anim_i)) {
@@ -647,10 +658,15 @@ var codec = new Codec('collada', {
  if (!track_channel.values[axis]) track_channel.values[axis] = [];
  track_channel.values[axis].push(0, 0);
  })
+ } else if (channel == 'scale') {
+ if (!track_channel.values) track_channel.values = [];
+ track_channel.values.push(1, 1, 1, 1, 1, 1);
  } else {
  if (!track_channel.values) track_channel.values = [];
- let v = channel == 'scale' ? 1 : 0;
- track_channel.values.push(v, v, v, v, v, v);
+ let pos = group.origin.slice();
+ if (group.parent instanceof Group) pos.V3_subtract(group.parent.origin);
+ pos.V3_divide(16);
+ track_channel.values.push(...pos, ...pos);
  }
  }
  }

diff --git a/js/webpack/bundle.js b/js/webpack/bundle.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "Blockbench",
  "description": "Low-poly modeling and animation software",
- "version": "4.3.0-beta.3",
+ "version": "4.3.0",
  "license": "GPL-3.0-or-later",
  "author": {
  "name": "JannisX11",