maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update armorui

Browse source
This commit is contained in:
Lubos Lenco 2017-07-25 17:37:46 +02:00
parent ea4e1fc008
commit 68bc9fbff0
12 changed files with 6 additions and 24524 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
Assets/console.ttf Executable file → Normal file
View file

Binary file not shown.

BIN
Assets/droid_sans.ttf Executable file → Normal file
View file

Binary file not shown.

13
blender/arm/props_traits.py
View file

@ -225,15 +225,10 @@ class ArmoryEditCanvasButton(bpy.types.Operator):
write_data.write_canvasprefs(canvas_path)
sdk_path = arm.utils.get_sdk_path()
electron_app_path = sdk_path + '/armory/tools/armorui/electron.js'
if arm.utils.get_os() == 'win':
electron_path = sdk_path + 'win32/Kode Studio.exe'
elif arm.utils.get_os() == 'mac':
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])
armorui_path = sdk_path + '/armory/tools/armorui/krom'
krom_location, krom_path = arm.utils.krom_paths()
os.chdir(krom_location)
subprocess.Popen([krom_path, armorui_path, armorui_path, '--nosound'])
return{'FINISHED'}
class ArmoryNewScriptDialog(bpy.types.Operator):

2
blender/arm/write_data.py
View file

@ -430,7 +430,7 @@ def write_canvasjson(canvas_name):
def write_canvasprefs(canvas_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:
f.write(
'{ "path": "' + canvas_path.replace('\\', '/') + '" }')

BIN
tools/armorui/DroidSans.ttf
View file

Binary file not shown.

14
tools/armorui/electron.js
View file

@ -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(); } });

24
tools/armorui/index.html
View file

@ -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
View file

File diff suppressed because it is too large Load diff

0
tools/armorui/.gitignore → tools/armorui/krom/.gitignore vendored
View file

BIN
tools/armorui/krom/DroidSans.ttf Normal file
View file

Binary file not shown.

BIN
tools/armorui/krom/color_wheel.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 36 KiB

1
tools/armorui/krom/krom.js Normal file
View file

File diff suppressed because one or more lines are too long