Skip to content

Commit

Permalink
v3.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@JannisX11
JannisX11 committed Jul 19, 2019
1 parent 5c5765f commit abdf97d
Show file tree
Hide file tree
Showing 41 changed files with 529 additions and 427 deletions.
7 changes: 5 additions & 2 deletions css/general.css
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*Defaults*/
div.tool.wide {
width: 72px;
padding-top: 0px;
padding: 1px 0;
}
.hidden, .tooltip_shift, .custom_select ul, .mobile_only, .m_disp {
display: none;
Expand Down Expand Up @@ -81,6 +81,9 @@
height: 40px;
padding-bottom: 5px;
}
input.medium_width {
width: 64px;
}

/*General*/
canvas.preview {
Expand Down Expand Up @@ -457,7 +460,7 @@
margin-left: auto;
margin-right: auto;
background-color: var(--color-ui);
overflow-y: auto;
overflow-y: scroll;
image-rendering: auto;
}
#start_screen > content > section {
Expand Down
3 changes: 3 additions & 0 deletions css/panels.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,9 @@
background: var(--color-accent);
color: var(--color-text_acc);
}
#display_sliders p {
margin-top: 6px;
}

/*Outliner*/
#cubes_list {
Expand Down
9 changes: 6 additions & 3 deletions css/setup.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,9 @@
opacity: 0.6;
}
div.nslide {
height: 30px;
height: 28px;
width: 100%;
padding: 4px;
padding: 3px;
padding-left: 6px;
cursor: e-resize;
overflow: hidden;
Expand Down Expand Up @@ -477,4 +477,7 @@
}
input:checked + label.toggle_panel {
background-color: var(--color-selected);
}
}
.y_scrollable {
overflow-y: scroll;
}
229 changes: 119 additions & 110 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<script>
if (typeof module === 'object') {window.module = module; module = undefined;}//jQuery Fix
const isApp = typeof require !== 'undefined';
const appVersion = '3.0.1';
const appVersion = '3.0.2';
</script>
<script src="lib/vue.min.js"></script>
<script src="lib/vue_sortable.js"></script>
Expand Down Expand Up @@ -338,11 +338,11 @@ <h1></h1>
<label class="tl">data.origin</label>
<div class="dialog_bar">
<label for="scaling_origin_x" class="inline_label tl">X</label>
<input type="number" id="scaling_origin_x" class="dark_bordered mediun_width" oninput="scaleAll()">
<input type="number" id="scaling_origin_x" class="dark_bordered medium_width" oninput="scaleAll()">
<label for="scaling_origin_y" class="inline_label tl">Y</label>
<input type="number" id="scaling_origin_y" class="dark_bordered mediun_width" oninput="scaleAll()">
<input type="number" id="scaling_origin_y" class="dark_bordered medium_width" oninput="scaleAll()">
<label for="scaling_origin_z" class="inline_label tl">Z</label>
<input type="number" id="scaling_origin_z" class="dark_bordered mediun_width" oninput="scaleAll()">
<input type="number" id="scaling_origin_z" class="dark_bordered medium_width" oninput="scaleAll()">
</div>

<label class="tl">dialog.scale.scale</label>
Expand Down Expand Up @@ -530,122 +530,124 @@ <h3 v-on:click="toggleCategory(category)"><i class="material-icons">{{ category.
<div id="layout_settings" class="hidden tab_content">
<h2 class="tl i_b">dialog.settings.layout</h2>
<div class="bar next_to_title" id="layout_title_bar"></div>
<div id="color_wrapper">
<div class="color_field">
<input type="color" class="color_input" id="color_ui" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_ui" style="background-color: var(--color-ui)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.ui</h4>
<p class="tl">layout.color.ui.desc</p>
<div class="y_scrollable" id="layout_list">
<div id="color_wrapper">
<div class="color_field">
<input type="color" class="color_input" id="color_ui" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_ui" style="background-color: var(--color-ui)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.ui</h4>
<p class="tl">layout.color.ui.desc</p>
</div>
</div>
</div>
<div class="color_field">
<input type="color" class="color_input" id="color_bright_ui" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_bright_ui" style="background-color: var(--color-bright_ui)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.bright_ui</h4>
<p class="tl">layout.color.bright_ui.desc</p>
<div class="color_field">
<input type="color" class="color_input" id="color_bright_ui" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_bright_ui" style="background-color: var(--color-bright_ui)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.bright_ui</h4>
<p class="tl">layout.color.bright_ui.desc</p>
</div>
</div>
</div>
<div class="color_field">
<input type="color" class="color_input" id="color_back" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_back" style="background-color: var(--color-back)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.back</h4>
<p class="tl">layout.color.back.desc</p>
<div class="color_field">
<input type="color" class="color_input" id="color_back" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_back" style="background-color: var(--color-back)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.back</h4>
<p class="tl">layout.color.back.desc</p>
</div>
</div>
</div>
<div class="color_field">
<input type="color" class="color_input" id="color_dark" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_dark" style="background-color: var(--color-dark)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.dark</h4>
<p class="tl">layout.color.dark.desc</p>
<div class="color_field">
<input type="color" class="color_input" id="color_dark" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_dark" style="background-color: var(--color-dark)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.dark</h4>
<p class="tl">layout.color.dark.desc</p>
</div>
</div>
</div>
<!--Button-->
<div class="color_field">
<input type="color" class="color_input" id="color_button" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_button" style="background-color: var(--color-button)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.button</h4>
<p class="tl">layout.color.button.desc</p>
<!--Button-->
<div class="color_field">
<input type="color" class="color_input" id="color_button" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_button" style="background-color: var(--color-button)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.button</h4>
<p class="tl">layout.color.button.desc</p>
</div>
</div>
</div>
<div class="color_field">
<input type="color" class="color_input" id="color_selected" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_selected" style="background-color: var(--color-selected)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.selected</h4>
<p class="tl">layout.color.selected.desc</p>
<div class="color_field">
<input type="color" class="color_input" id="color_selected" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_selected" style="background-color: var(--color-selected)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.selected</h4>
<p class="tl">layout.color.selected.desc</p>
</div>
</div>
</div>
<div class="color_field">
<input type="color" class="color_input" id="color_border" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_border" style="background-color: var(--color-border)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.border</h4>
<p class="tl">layout.color.border.desc</p>
<div class="color_field">
<input type="color" class="color_input" id="color_border" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_border" style="background-color: var(--color-border)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.border</h4>
<p class="tl">layout.color.border.desc</p>
</div>
</div>
</div>
<div class="color_field">
<input type="color" class="color_input" id="color_accent" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_accent" style="background-color: var(--color-accent)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.accent</h4>
<p class="tl">layout.color.accent.desc</p>
<div class="color_field">
<input type="color" class="color_input" id="color_accent" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_accent" style="background-color: var(--color-accent)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.accent</h4>
<p class="tl">layout.color.accent.desc</p>
</div>
</div>
</div>
<div class="color_field">
<input type="color" class="color_input" id="color_text" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_text" style="background-color: var(--color-text)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.text</h4>
<p class="tl">layout.color.text.desc</p>
<div class="color_field">
<input type="color" class="color_input" id="color_text" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_text" style="background-color: var(--color-text)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.text</h4>
<p class="tl">layout.color.text.desc</p>
</div>
</div>
</div>
<div class="color_field">
<input type="color" class="color_input" id="color_light" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_light" style="background-color: var(--color-light)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.light</h4>
<p class="tl">layout.color.light.desc</p>
<div class="color_field">
<input type="color" class="color_input" id="color_light" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_light" style="background-color: var(--color-light)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.light</h4>
<p class="tl">layout.color.light.desc</p>
</div>
</div>
</div>
<div class="color_field">
<input type="color" class="color_input" id="color_text_acc" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_text_acc" style="background-color: var(--color-text_acc)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.accent_text</h4>
<p class="tl">layout.color.accent_text.desc</p>
<div class="color_field">
<input type="color" class="color_input" id="color_text_acc" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_text_acc" style="background-color: var(--color-text_acc)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.accent_text</h4>
<p class="tl">layout.color.accent_text.desc</p>
</div>
</div>
</div>
<div class="color_field">
<input type="color" class="color_input" id="color_grid" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_grid" style="background-color: var(--color-grid)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.grid</h4>
<p class="tl">layout.color.grid.desc</p>
<div class="color_field">
<input type="color" class="color_input" id="color_grid" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_grid" style="background-color: var(--color-grid)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.grid</h4>
<p class="tl">layout.color.grid.desc</p>
</div>
</div>
</div>
<div class="color_field">
<input type="color" class="color_input" id="color_wireframe" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_wireframe" style="background-color: var(--color-wireframe)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.wireframe</h4>
<p class="tl">layout.color.wireframe.desc</p>
<div class="color_field">
<input type="color" class="color_input" id="color_wireframe" oninput="changeUIColor(event)" onclick="initUIColor(event)">
<label for="color_wireframe" style="background-color: var(--color-wireframe)" class="color_input"></label>
<div class="desc">
<h4 class="tl">layout.color.wireframe</h4>
<p class="tl">layout.color.wireframe.desc</p>
</div>
</div>
</div>
</div>

<div class="dialog_bar">
<label class="name_space_left tl" for="layout_font_main">layout.font.main</label>
<input type="text" class="half dark_bordered" id="layout_font_main" oninput="changeUIFont('main')">
</div>
<div class="dialog_bar">
<label class="name_space_left tl" for="layout_font_main">layout.font.main</label>
<input type="text" class="half dark_bordered" id="layout_font_main" oninput="changeUIFont('main')">
</div>

<div class="dialog_bar">
<label class="name_space_left tl" for="layout_font_headline">layout.font.headline</label>
<input type="text" class="half dark_bordered" id="layout_font_headline" oninput="changeUIFont('headline')">
<div class="dialog_bar">
<label class="name_space_left tl" for="layout_font_headline">layout.font.headline</label>
<input type="text" class="half dark_bordered" id="layout_font_headline" oninput="changeUIFont('headline')">
</div>
</div>

</div>
Expand Down Expand Up @@ -944,22 +946,29 @@ <h2 class="tl i_b">dialog.settings.about</h2>
</div>
</div>
<div id="right_bar" class="sidebar">
<!--div id="options" class="panel selection_only">
<p class="tl">panel.options.angle</p>
<div class="toolbar_wrapper rotation"></div>
<p class="tl">data.origin</p>
<div class="toolbar_wrapper origin"></div>
</div-->
<div id="element" class="panel selection_only">
<p class="tl">panel.element.position</p>
<div class="toolbar_wrapper element_position"></div>
<p class="tl">panel.element.size</p>
<div class="toolbar_wrapper element_size"></div>
<p class="tl">panel.element.origin</p>
<div class="toolbar_wrapper element_origin"></div>
<p class="tl">panel.element.rotation</p>
<div class="toolbar_wrapper element_rotation"></div>
</div>

<div id="color" class="panel">
<div id="main_colorpicker_preview"><div></div></div>
<input id="main_colorpicker">
</div>

<div id="outliner" class="panel grow">
<div class="toolbar_wrapper outliner"></div>
<ul id="cubes_list" class="list">
<vue-tree :option="option"></vue-tree>
</ul>
</div>

<div id="chat" class="panel grow">
<div class="bar next_to_title" id="chat_title_bar"></div>
<ul id="chat_history" v-if="expanded">
Expand Down
6 changes: 3 additions & 3 deletions js/animations.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ const Timeline = {
if (time == undefined || isNaN(time)) {
time = Timeline.second;
}
var fps = settings.animation_snap.value;
var fps = Math.clamp(settings.animation_snap.value, 1, 120);
return Math.clamp(Math.round(time*fps)/fps, 0);
},
setup() {
Expand Down Expand Up @@ -1068,7 +1068,7 @@ const Timeline = {
$('#timeline_inner .keyframe:not(.ui-draggable)').draggable({
axis: 'x',
distance: 4,
helper: false,
helper: () => $('<div></div>'),
start: function(event, ui) {
Undo.initEdit({keyframes: Timeline.keyframes, keep_saved: true})
var id = $(ui.helper).attr('id')
Expand Down Expand Up @@ -1148,7 +1148,7 @@ const Timeline = {
else {step = 0.05}

if (step < 1) {
var FPS = 1/settings.animation_snap.value;
var FPS = 1/Math.clamp(settings.animation_snap.value, 1, 120);
step = Math.round(step/FPS) * FPS
step = 1/Math.round(1/step)
}
Expand Down
Loading

0 comments on commit abdf97d

Please sign in to comment.