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

Area maximizing.

Browse source
This commit is contained in:
Lubos Lenco 2016-11-05 12:56:12 +01:00
parent 52c516c957
commit 2348aa06f9
3 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Shaders/deferred/translucent.frag.glsl
View file

@ -171,6 +171,9 @@ void main() {
vec4 premultipliedReflect = vec4(vec3(direct + indirect * occlusion), matColor.a);
#ifdef _BaseTex
premultipliedReflect.a *= texel.a; // Base color alpha
#endif
// vec4 premultipliedReflect = vec4(1.0, 0.0, 0.0, 0.01);
// vec4 premultipliedReflect = baseColor;

4
Sources/armory/trait/internal/EditorSpace.hx
View file

@ -41,11 +41,15 @@ class EditorSpace extends Trait {
}
}
var shiftDown = false;
function onKeyDown(key: kha.Key, char: String) {
if (char == 'Z' || key == kha.Key.ESC) trace('__arm|quit');
else if (key == kha.Key.SHIFT) shiftDown = true;
else if (shiftDown && char == ' ') trace('__arm|screen_full_area'); // bpy.ops.screen.screen_full_area
}
function onKeyUp(key: kha.Key, char: String) {
if (key == kha.Key.SHIFT) shiftDown = false;
}
function update() {

6
blender/bridge.py
View file

@ -18,6 +18,12 @@ def parse_operator(text):
if cmd[0] == '__arm':
if cmd[1] == 'quit':
bpy.ops.arm.space_stop('EXEC_DEFAULT')
if cmd[1] == 'screen_full_area':
for area in bpy.context.screen.areas:
if area.type == 'VIEW_ARMORY':
override = {'window': bpy.context.window, 'screen': bpy.context.screen, 'area': area, 'blend_data': bpy.context.blend_data, 'region': bpy.context.region}
bpy.ops.screen.screen_full_area(override)
break
elif cmd[1] == 'setx':
bpy.context.scene.objects[cmd[2]].location.x = float(cmd[3])
elif cmd[1] == 'select':