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

Window mode

Browse source
This commit is contained in:
Lubos Lenco 2017-06-06 20:01:24 +02:00
parent fc27d9afc1
commit 088f421159
3 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
blender/arm/props.py
View file

@ -18,7 +18,7 @@ except ImportError:
pass
# Armory version
arm_version = '17.05'
arm_version = '17.06'
def update_preset(self, context):
props_renderer.set_preset(self, context, self.rp_preset)
@ -175,6 +175,11 @@ def init_properties():
name="Runtime", description="Player runtime used when launching in new window", default='Krom', update=assets.invalidate_shader_cache)
bpy.types.World.arm_loadbar = BoolProperty(name="Load Bar", description="Show asset loading progress on published builds", default=True)
bpy.types.World.arm_vsync = BoolProperty(name="VSync", description="Vertical Synchronization", default=True)
bpy.types.World.arm_winmode = EnumProperty(
items = [('Window', 'Window', 'Window'),
('BorderlessWindow', 'Borderless', 'BorderlessWindow'),
('Fullscreen', 'Fullscreen', 'Fullscreen')],
name="Window Mode", default='Window', description='Window mode to start in')
bpy.types.World.arm_gapi_win = EnumProperty(
items = [('opengl', 'Auto', 'opengl'),
('opengl', 'OpenGL', 'opengl'),

1
blender/arm/props_ui.py
View file

@ -485,6 +485,7 @@ class ArmoryProjectPanel(bpy.types.Panel):
layout.prop(wrd, 'arm_play_active_scene')
if wrd.arm_play_active_scene == False:
layout.prop_search(wrd, 'arm_project_scene', bpy.data, 'scenes', 'Scene')
layout.prop(wrd, 'arm_winmode')
layout.label('Armory v' + wrd.arm_version)
layout.operator('arm.check_updates')
row = layout.row(align=True)

3
blender/arm/write_data.py
View file

@ -155,6 +155,7 @@ class Main {
public static inline var projectName = '""" + arm.utils.safestr(wrd.arm_project_name) + """';
public static inline var projectPackage = '""" + arm.utils.safestr(wrd.arm_project_package) + """';
public static inline var projectAssets = """ + str(len(assets.assets)) + """;
public static var projectWindowMode = kha.WindowMode.""" + str(wrd.arm_winmode) + """;
static inline var projectWidth = """ + str(resx) + """;
static inline var projectHeight = """ + str(resy) + """;
static inline var projectSamplesPerPixel = """ + str(int(wrd.arm_samples_per_pixel)) + """;
@ -182,7 +183,7 @@ class Main {
static function start() {
if (state > 0) return;
armory.object.Uniforms.register();
kha.System.init({title: projectName, width: projectWidth, height: projectHeight, samplesPerPixel: projectSamplesPerPixel, vSync: projectVSync}, function() {
kha.System.init({title: projectName, width: projectWidth, height: projectHeight, samplesPerPixel: projectSamplesPerPixel, vSync: projectVSync, windowMode: projectWindowMode}, function() {
iron.App.init(function() {
""")
if is_publish and wrd.arm_loadbar: