Update armorui
This commit is contained in:
parent
ea4e1fc008
commit
68bc9fbff0
BIN
Assets/console.ttf
Executable file → Normal file
BIN
Assets/console.ttf
Executable file → Normal file
Binary file not shown.
BIN
Assets/droid_sans.ttf
Executable file → Normal file
BIN
Assets/droid_sans.ttf
Executable file → Normal file
Binary file not shown.
|
@ -225,15 +225,10 @@ class ArmoryEditCanvasButton(bpy.types.Operator):
|
||||||
write_data.write_canvasprefs(canvas_path)
|
write_data.write_canvasprefs(canvas_path)
|
||||||
|
|
||||||
sdk_path = arm.utils.get_sdk_path()
|
sdk_path = arm.utils.get_sdk_path()
|
||||||
electron_app_path = sdk_path + '/armory/tools/armorui/electron.js'
|
armorui_path = sdk_path + '/armory/tools/armorui/krom'
|
||||||
if arm.utils.get_os() == 'win':
|
krom_location, krom_path = arm.utils.krom_paths()
|
||||||
electron_path = sdk_path + 'win32/Kode Studio.exe'
|
os.chdir(krom_location)
|
||||||
elif arm.utils.get_os() == 'mac':
|
subprocess.Popen([krom_path, armorui_path, armorui_path, '--nosound'])
|
||||||
electron_path = sdk_path + 'Kode Studio.app/Contents/MacOS/Electron'
|
|
||||||
else:
|
|
||||||
electron_path = sdk_path + 'linux64/kodestudio'
|
|
||||||
subprocess.Popen([electron_path, '--chromedebug', '--remote-debugging-port=9222', '--enable-logging', electron_app_path, canvas_path])
|
|
||||||
|
|
||||||
return{'FINISHED'}
|
return{'FINISHED'}
|
||||||
|
|
||||||
class ArmoryNewScriptDialog(bpy.types.Operator):
|
class ArmoryNewScriptDialog(bpy.types.Operator):
|
||||||
|
|
|
@ -430,7 +430,7 @@ def write_canvasjson(canvas_name):
|
||||||
|
|
||||||
def write_canvasprefs(canvas_path):
|
def write_canvasprefs(canvas_path):
|
||||||
sdk_path = arm.utils.get_sdk_path()
|
sdk_path = arm.utils.get_sdk_path()
|
||||||
prefs_path = sdk_path + 'armory/tools/armorui/prefs.json'
|
prefs_path = sdk_path + 'armory/tools/armorui/krom/prefs.json'
|
||||||
with open(prefs_path, 'w') as f:
|
with open(prefs_path, 'w') as f:
|
||||||
f.write(
|
f.write(
|
||||||
'{ "path": "' + canvas_path.replace('\\', '/') + '" }')
|
'{ "path": "' + canvas_path.replace('\\', '/') + '" }')
|
||||||
|
|
Binary file not shown.
|
@ -1,14 +0,0 @@
|
||||||
'use strict';
|
|
||||||
const electron = require('electron');
|
|
||||||
const app = electron.app;
|
|
||||||
const BrowserWindow = electron.BrowserWindow;
|
|
||||||
let mainWindow;
|
|
||||||
|
|
||||||
function createWindow () {
|
|
||||||
mainWindow = new BrowserWindow({width: 1240, height: 640, autoHideMenuBar: true, useContentSize: true});
|
|
||||||
mainWindow.loadURL('file://' + __dirname + '/index.html');
|
|
||||||
mainWindow.on('closed', function() { mainWindow = null; });
|
|
||||||
}
|
|
||||||
app.on('ready', createWindow);
|
|
||||||
app.on('window-all-closed', function () { app.quit(); });
|
|
||||||
app.on('activate', function () { if (mainWindow === null) { createWindow(); } });
|
|
|
@ -1,24 +0,0 @@
|
||||||
<!DOCTYPE html>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8"/>
|
|
||||||
<title>ArmorUI</title>
|
|
||||||
<style>
|
|
||||||
html, body, canvas, div {
|
|
||||||
margin:0;
|
|
||||||
padding: 0;
|
|
||||||
width:100%;
|
|
||||||
height:100%;
|
|
||||||
}
|
|
||||||
#khanvas {
|
|
||||||
display:block;
|
|
||||||
border:none;
|
|
||||||
outline:none;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<canvas id="khanvas" width="0" height="0"></canvas>
|
|
||||||
<script src="kha.js"></script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
24476
tools/armorui/kha.js
24476
tools/armorui/kha.js
File diff suppressed because it is too large
Load diff
BIN
tools/armorui/krom/DroidSans.ttf
Normal file
BIN
tools/armorui/krom/DroidSans.ttf
Normal file
Binary file not shown.
BIN
tools/armorui/krom/color_wheel.png
Normal file
BIN
tools/armorui/krom/color_wheel.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 36 KiB |
1
tools/armorui/krom/krom.js
Normal file
1
tools/armorui/krom/krom.js
Normal file
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue