Skip to content

Commit

Permalink
v1.11.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@JannisX11
JannisX11 authored Apr 5, 2018
1 parent 8776430 commit 4084fec
Show file tree
Hide file tree
Showing 17 changed files with 451 additions and 276 deletions.
9 changes: 5 additions & 4 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ <h2 class="dialog_handle">Project</h2>


<div class="dialog_bar">
<button type="button" class="large confirm_btn cancel_btn" onclick="saveSettings()">Close</button>
<button type="button" class="large confirm_btn cancel_btn" onclick="saveProjectSettings()">Close</button>
<button type="button" class="large" id="entity_mode_convert" onclick="entityMode.convert()">To Entity Model</button>
</div>
<div id="dialog_close_button" onclick="$('.dialog#'+open_dialog).find('.cancel_btn:not([disabled])').click()"><i class="material-icons">clear</i></div>
Expand Down Expand Up @@ -649,7 +649,7 @@ <h2>About</h2>
<div onclick="uv_dialog.openTab('up')" id="up" class="tab">Up</div>
<div onclick="uv_dialog.openTab('down')" id="down" class="tab">Down</div>
</div>
<h2 class="dialog_handle entity_mode_only">Input</h2>
<h2 class="dialog_handle entity_mode_only">UV Editor</h2>
<div id="uv_dialog_all" class="uv_dialog_content uv_dialog_all_only">

</div>
Expand Down Expand Up @@ -1045,7 +1045,8 @@ <h3>Textures</h3>
v-for="texture in textures"
v-bind:class="{ selected: texture.selected }"
v-bind:texid="texture.id"
class="texture" v-on:click.stop="texture.select()"
class="texture"
v-on:click.stop="texture.select()"
v-on:dblclick="texture.openMenu($event)"
@contextmenu.prevent.stop="texture.showContextMenu($event)"
>
Expand Down Expand Up @@ -1073,7 +1074,7 @@ <h3>Textures</h3>
<div id="options" class="ui selection_only">
<h3>Rotation</h3>
<div class="bar">
<div class="placeholder"></div>Rotation
<div class="placeholder"></div>Angle
</div>
<div class="bar" id="rotation_main_bar" style="position: relative;">
<div id="cube_rotate_dummy"></div>
Expand Down
11 changes: 10 additions & 1 deletion js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ function findEntityTexture(mob, return_path) {
'geometry.enderman': 'enderman/enderman',
'geometry.zombie': 'zombie/zombie',
'geometry.zombie.husk': 'zombie/husk',
'geometry.zombie.drowned': 'zombie/drowned',
'geometry.pigzombie': 'pig/pigzombie',
'geometry.pigzombie.baby': 'pig/pigzombie',
'geometry.skeleton': 'skeleton/skeleton',
Expand All @@ -244,6 +245,7 @@ function findEntityTexture(mob, return_path) {
'geometry.vindicator': 'vindicator',
'geometry.wolf': 'wolf/wolf',
'geometry.ocelot': 'cat/ocelot',
'geometry.trident': 'trident',
'geometry.guardian': 'guardian',
'geometry.polarbear': 'polarbear',
'geometry.villager': 'villager/villager',
Expand All @@ -255,7 +257,14 @@ function findEntityTexture(mob, return_path) {
'geometry.bed': 'bed/white',
'geometry.player_head': 'steve',
'geometry.mob_head': 'skeleton/skeleton',
'geometry.dragon_head': 'dragon/dragon'
'geometry.dragon_head': 'dragon/dragon',
'geometry.cod': 'fish/fish',
'geometry.pufferfish.small': 'fish/pufferfish',
'geometry.pufferfish.mid': 'fish/pufferfish',
'geometry.pufferfish.large': 'fish/pufferfish',
'geometry.salmon': 'fish/salmon',
'geometry.tropicalfish_a': 'fish/tropical_a',
'geometry.tropicalfish_b': 'fish/tropical_b'
}
var path = textures[mob.split(':')[0]]
if (path) {
Expand Down
119 changes: 55 additions & 64 deletions js/blockbench.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var appVersion = '1.11.0'
var appVersion = '1.11.1'
var osfs = '/'
var File, i;
var browser_name = 'electron'
Expand Down Expand Up @@ -75,8 +75,6 @@ function initializeApp() {
}
Toolbox.updateBar()

updateMenu()

if (isApp) {
updateRecentProjects()
}
Expand Down Expand Up @@ -321,26 +319,6 @@ function setupVue() {
})
project_vue._data.Project = Project

/*
var displaypresets_vue = new Vue({
el: '#display_presets',
data: {display_presets},
methods: {
applyPreset: function(preset, event) {
var index = display_presets.indexOf(preset)
applyDisplayPreset(display_presets[index])
},
deletePreset: function(preset, event) {
var index = display_presets.indexOf(preset)
if (display_presets[index].fixed == true) return;
display_presets.splice(index, 1)
localStorage.setItem('display_presets', JSON.stringify(display_presets))
}
}
})
displaypresets_vue._data.display_presets = display_presets
*/

var stats_bar_vue = new Vue({
el: '#status_bar',
data: {Prop}
Expand Down Expand Up @@ -954,6 +932,9 @@ var Undo = {
history: [],

add: function(action, isTextureEdit) {
if (settings.show_actions.value === true) {
showStatusMessage(action)
}
if (isTextureEdit) {
var entry = new Undo.textureHistoryEntry(action)
} else {
Expand Down Expand Up @@ -1057,7 +1038,7 @@ var Undo = {
tex.iconpath = arr.join('?')
}

tex.load()
tex.load(true, true)
textures.push(tex)
})
texturelist.$forceUpdate();
Expand Down Expand Up @@ -1097,12 +1078,7 @@ var Undo = {
})
}
}
function setUndo(action) {
if (settings.show_actions.value === true) {
showStatusMessage(action)
}
Undo.add(action)
}
var setUndo = Undo.add
//Misc
var Screencam = {
normalCanvas: function(options, cb) {
Expand Down Expand Up @@ -1168,7 +1144,7 @@ var Screencam = {
})
});
})
}, 20)
}, 40)
},
returnScreenshot: function(dataUrl, cb) {
if (cb) {
Expand Down Expand Up @@ -1211,46 +1187,32 @@ var clipbench = {
var p = Prop.active_panel
if (open_dialog == 'uv_dialog') {
uv_dialog.copy(event)
} else if (p == 'uv') {
main_uv.copy(event)
} else if (display_mode) {
copyDisplaySlot()
} else if (p == 'uv' || p == 'preview') {
main_uv.copy(event)
} else if (p == 'textures' && isApp) {
if (textures.selected) {
cl('test')
if (textures.selected.mode === 'bitmap') {
var img = nativeImage.createFromDataURL(textures.selected.iconpath)
} else {
var img = nativeImage.createFromPath(textures.selected.iconpath.split('?')[0])
}
clipboard.writeImage(img)
clipbench.setTexture(textures.selected)
}
} else if (p == 'outliner' || p == 'preview') {
clipbench.cubes = []
clipbench.group = undefined
} else if (p == 'outliner') {
clipbench.setCubes()
clipbench.setGroup()
if (selected_group) {
clipbench.group = selected_group.duplicate('cache')
if (isApp) {
clipboard.writeHTML(JSON.stringify({type: 'group', content: clipbench.group}))
}
clipbench.setGroup(selected_group)
} else {
selected.forEach(function(obj) {
var base_cube = new Cube(obj)
base_cube.display.mesh = undefined;
clipbench.cubes.push(base_cube)
})
clipboard.writeHtml(JSON.stringify({type: 'cubes', content: clipbench.cubes}))
clipbench.setCubes(selected)
}
}
},
paste: function(event) {
var p = Prop.active_panel
if (open_dialog == 'uv_dialog') {
uv_dialog.paste(event)
} else if (p == 'uv') {
main_uv.paste(event)
} else if (display_mode) {
pasteDisplaySlot()
} else if (p == 'uv' || p == 'preview') {
main_uv.paste(event)
} else if (p == 'textures' && isApp) {
var img = clipboard.readImage()
if (img) {
Expand All @@ -1260,7 +1222,7 @@ var clipbench = {
texture.openMenu()
},40)
}
} else if (p == 'outliner' || p == 'preview') {
} else if (p == 'outliner') {
//Group
var group = 'root'
if (selected_group) {
Expand All @@ -1286,22 +1248,51 @@ var clipbench = {
clipbench.group.duplicate(group)
} else {
clipbench.cubes.forEach(function(obj) {
var base_cube = new Cube()
base_cube.extend(obj)
base_cube.uuid = guid()
base_cube.display.mesh = undefined;

elements.push(base_cube)
base_cube.addTo(group)
Canvas.addCube(elements[elements.length-1])
var base_cube = new Cube(obj)

base_cube.addTo(group).init()
selected.push(elements[elements.length-1])
})
updateSelection()
setUndo('Pasted Cubes')
}
}
},
setTexture: function(texture) {
//Sets the raw image of the texture
if (!isApp) return;

if (texture.mode === 'bitmap') {
var img = nativeImage.createFromDataURL(texture.iconpath)
} else {
var img = nativeImage.createFromPath(texture.iconpath.split('?')[0])
}
clipboard.writeImage(img)
},
setGroup: function(group) {
if (!group) {
clipbench.group = undefined
return;
}
clipbench.group = group.duplicate('cache')
if (isApp) {
clipboard.writeHTML(JSON.stringify({type: 'group', content: clipbench.group}))
}
},
setCubes: function(cubes) {
if (!cubes) {
clipbench.cubes = []
return;
}
cubes.forEach(function(obj) {
var base_cube = new Cube(obj)
base_cube.display.mesh = undefined;
clipbench.cubes.push(base_cube)
})
if (isApp) {
clipboard.writeHtml(JSON.stringify({type: 'cubes', content: clipbench.cubes}))
}
}
}
TextureAnimator = {
isPlaying: false,
Expand Down
16 changes: 9 additions & 7 deletions js/canvas.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function initCanvas() {
cameraOrtho.axis = null
cameraPers.position.set(-20, 20, -20)

wireframeMaterial = new THREE.LineBasicMaterial({color: 0x74c2ff, linewidth: 1})
wireframeMaterial = new THREE.LineBasicMaterial({color: 0x74c2ff})

controls = new THREE.OrbitControls(cameraPers, canvas1);
controls.minDistance = 1;
Expand Down Expand Up @@ -322,7 +322,6 @@ function buildGrid() {
var size, step;
var grid_color = new THREE.Color(parseInt('0x'+app_colors.grid.hex.replace('#', ''), 16))
var line_material = new THREE.LineBasicMaterial({color: grid_color});
line_material.linewidth = 6;
var material;

northMarkMaterial.color = grid_color
Expand Down Expand Up @@ -1017,12 +1016,15 @@ class CanvasController {
//East+West

var p = {}
p.from = face_list[1].from
p.to = face_list[1].to

p.from = face_list[1].from.slice()
p.to = face_list[1].to.slice()

face_list[1].from = face_list[3].from.slice()
face_list[1].to = face_list[3].to.slice()
p.from = face_list[3].from.slice()
p.to = face_list[3].to.slice()

face_list[3].from = p.from.slice()
face_list[3].to = p.to.slice()

}
face_list.forEach(function(f) {
Expand Down Expand Up @@ -1109,7 +1111,7 @@ class CanvasController {
var geo = new THREE.EdgesGeometry(object.geometry);

var outline_color = '0x'+app_colors.accent.hex.replace('#', '')
var mat = new THREE.LineBasicMaterial({color: parseInt(outline_color), linewidth: 50})
var mat = new THREE.LineBasicMaterial({color: parseInt(outline_color), linewidth: 2})
var wireframe = new THREE.LineSegments(geo, mat)
wireframe.name = obj.uuid+'_outline'
wireframe.position.set(object.position.x, object.position.y, object.position.z)
Expand Down
8 changes: 4 additions & 4 deletions js/display.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ class refModel {
if (id === 'player') {
this.onload = function() {
if (slot === 'thirdperson_righthand') {
setDisplayArea(-5, 8, -6, -90, 22.5, 90, 1, 1, 1)
setDisplayArea(-5.7, 7.5, -6, -90, 22.5, 90, 1, 1, 1)
} else if (slot === 'thirdperson_lefthand') {
setDisplayArea(-5, 8, 6, -90, 22.5, 90, 1, 1, 1)
setDisplayArea(-5.7, 7.5, 6, -90, 22.5, 90, 1, 1, 1)
} else if (slot === 'head') {
setDisplayArea(0, 22, 0, 0, 90, 0, 0.625, 0.625, 0.625)
}
Expand Down Expand Up @@ -156,7 +156,7 @@ class refModel {
buildPlayer() {
var scope = this;
var things = [
{"size": [4, 12, 4], "pos": [0, 12, -6], "origin": [0, 16, 0], "angle": -20,
{"size": [4, 12, 4], "pos": [0, 12, -6], "origin": [0, 16, 0], "angle": -22.5,
"north": {"uv": [10, 5, 11, 8], "texture": "#0"},
"east": {"uv": [13, 5, 14, 8], "texture": "#0"},
"south": {"uv": [12, 5, 13, 8], "texture": "#0"},
Expand All @@ -165,7 +165,7 @@ class refModel {
"down": { "uv": [12, 4, 13, 5], "texture": "#0", "rotation": 270 }
}, //Right Arm

{"size": [4, 12, 4], "pos": [0, 12, 6], "origin": [0, 16, 0], "angle": -20,
{"size": [4, 12, 4], "pos": [0, 12, 6], "origin": [0, 16, 0], "angle": -22.5,
"north": {"uv": [8, 13, 9, 16], "texture": "#0"},
"east": {"uv": [11, 13, 12, 16], "texture": "#0"},
"south": {"uv": [10, 13, 11, 16], "texture": "#0"},
Expand Down
Loading

0 comments on commit 4084fec

Please sign in to comment.