JannisX11/blockbench
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable animation file options in generic models

Browse Source
This commit is contained in:
JannisX11 2021-01-03 21:23:17 +01:00
parent 9c9714b52b
commit ab916f50ab
4 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
css/panels.css
View File

@ -462,7 +462,6 @@
position: relative;
vertical-align: middle;
padding: 8px;
padding-left: 16px;
box-sizing: border-box;
}
.animation:hover {
@ -471,6 +470,9 @@
.animation.selected {
background: var(--color-selected);
}
ul.indented .animation {
padding-left: 16px;
}
.animation > i {
margin-right: 4px;
}
@ -855,13 +857,16 @@
.animator_channel_bar .channel_head .text_button .channel_mute {
font-size: 11pt;
}
.animator_channel_bar .channel_head .text_button .fa-eye-slash {
color: var(--color-subtle_text);
}
.channel_head span {
flex-grow: 1;
flex-shrink: 1;
overflow: hidden;
}
.animator_channel_bar .channel_head span {
opacity: 0.75
color: var(--color-subtle_text);
}
.keyframe_section {
flex-grow: 1;

35
js/animations/animation.js
View File

@ -481,7 +481,7 @@ class Animation {
type: 'file',
extensions: ['json'],
filetype: 'JSON Animation',
condition: isApp
condition: Animation.properties.path.condition
},
loop: {
label: 'menu.animation.loop',
@ -564,6 +564,7 @@ class Animation {
name: 'menu.animation.save',
id: 'save',
icon: 'save',
condition: () => Format.animation_files,
click(animation) {
animation.save();
}
@ -572,7 +573,7 @@ class Animation {
name: 'menu.animation.open_location',
id: 'open_location',
icon: 'folder',
condition(animation) {return isApp && animation.path && fs.existsSync(animation.path)},
condition(animation) {return isApp && Format.animation_files && animation.path && fs.existsSync(animation.path)},
click(animation) {
shell.showItemInFolder(animation.path);
}
@ -601,10 +602,11 @@ class Animation {
Undo.finishEdit('remove animation', {animations: []})
}}
])
new Property(Animation, 'boolean', 'saved', {default: true})
new Property(Animation, 'string', 'path')
new Property(Animation, 'boolean', 'saved', {default: true, condition: () => Format.animation_files})
new Property(Animation, 'string', 'path', {condition: () => isApp && Format.animation_files})
Blockbench.on('finish_edit', event => {
if (!Format.animation_files) return;
if (event.aspects.animations && event.aspects.animations.length) {
event.aspects.animations.forEach(animation => {
animation.saved = false;
@ -1704,7 +1706,7 @@ BARS.defineActions(function() {
new Action('load_animation_file', {
icon: 'fa-file-video',
category: 'animation',
condition: {modes: ['animate']},
condition: {modes: ['animate'], method: () => Format.animation_files},
click: function () {
var path = ModelMeta.export_path
if (isApp) {
@ -1762,6 +1764,7 @@ BARS.defineActions(function() {
new Action('save_all_animations', {
icon: 'save',
category: 'animation',
condition: () => Format.animation_files,
click: function () {
let paths = [];
Animation.all.forEach(animation => {
@ -1837,8 +1840,9 @@ Interface.definePanels(function() {
component: {
name: 'panel-animations',
data() { return {
animations: Animator.animations,
files_folded: {}
animations: Animation.all,
files_folded: {},
animation_files_enabled: true
}},
methods: {
toggle(key) {
@ -1861,6 +1865,15 @@ Interface.definePanels(function() {
},
computed: {
files() {
if (!this.animation_files_enabled) {
return {
'': {
animations: this.animations,
name: '',
hide_head: true
}
}
}
let files = {};
this.animations.forEach(animation => {
let key = animation.path || '';
@ -1880,17 +1893,17 @@ Interface.definePanels(function() {
<div class="toolbar_wrapper animations"></div>
<ul id="animations_list" class="list">
<li v-for="(file, key) in files" :key="key" class="animation_file" @contextmenu.prevent.stop="showFileContextMenu($event, key)">
<div class="animation_file_head" v-on:click.stop="toggle(key)">
<div class="animation_file_head" v-if="!file.hide_head" v-on:click.stop="toggle(key)">
<i v-on:click.stop="toggle(key)" class="icon-open-state fa" :class=\'{"fa-angle-right": files_folded[key], "fa-angle-down": !files_folded[key]}\'></i>
<label :title="key">{{ file.name }}</label>
<div class="in_list_button" v-if="!file.saved" v-on:click.stop="saveFile(key, file)">
<div class="in_list_button" v-if="animation_files_enabled && !file.saved" v-on:click.stop="saveFile(key, file)">
<i class="material-icons">save</i>
</div>
<div class="in_list_button" v-on:click.stop="addAnimation(key)">
<i class="material-icons">add</i>
</div>
</div>
<ul v-if="!files_folded[key]">
<ul v-if="!files_folded[key]" :class="{indented: !file.hide_head}">
<li
v-for="animation in file.animations"
v-bind:class="{ selected: animation.selected }"
@ -1903,7 +1916,7 @@ Interface.definePanels(function() {
>
<i class="material-icons">movie</i>
<label :title="animation.name">{{ animation.name }}</label>
<div class="in_list_button" v-bind:class="{unclickable: animation.saved}" v-on:click.stop="animation.save()">
<div v-if="animation_files_enabled" class="in_list_button" v-bind:class="{unclickable: animation.saved}" v-on:click.stop="animation.save()">
<i v-if="animation.saved" class="material-icons">check_circle</i>
<i v-else class="material-icons">save</i>
</div>

1
js/io/format.js
View File

@ -87,6 +87,7 @@ class ModelFormat {
uv_dialog.all_editors.forEach(editor => {
editor.img.style.objectFit = Format.animated_textures ? 'cover' : 'fill';
})
Interface.Panels.animations.inside_vue._data.animation_files_enabled = this.animation_files;
for (var key in ModelProject.properties) {
if (Project[key] == undefined) {
ModelProject.properties[key].reset(Project);

2
js/io/io.js
View File

@ -549,7 +549,7 @@ BARS.defineActions(function() {
Format.codec.export()
}
}
if (Format.animation_mode && Animation.all.length) {
if (Format.animation_mode && Format.animation_files && Animation.all.length) {
BarItems.save_all_animations.trigger();
}
} else {