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

Gapi enums

Browse source
This commit is contained in:
Lubos Lenco 2017-02-07 12:22:38 +01:00
parent 660406bab2
commit d4d524efaf
2 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
blender/make.py
View file

@ -159,17 +159,9 @@ def compile_project(target_name=None, is_publish=False, watch=False, patch=False
cmd.append('--ffmpeg')
cmd.append('"' + ffmpeg_path + '"')
if armutils.get_os() == 'win':
if target_name == '' or target_name == '--run':
cmd.append('-g')
if target_name == '' or target_name == '--run':
if wrd.arm_gapi_win == 'direct3d9':
cmd.append('direct3d9')
elif wrd.arm_gapi_win == 'direct3d11':
cmd.append('direct3d11')
else:
cmd.append('opengl2')
else:
cmd.append('opengl2')
cmd.append(getattr(wrd, 'arm_gapi_' + armutils.get_os()))
if kha_target_name == 'krom':
if state.in_viewport:

42
blender/props.py
View file

@ -7,6 +7,8 @@ import props_renderer
import assets
import log
import armutils
import os
import shutil
try:
import barmory
except ImportError:
@ -38,6 +40,34 @@ def update_mat_cache(self, context):
else:
bpy.data.worlds['Arm'].arm_recompile_trigger = True
def update_gapi_win(self, context):
if os.path.isdir(armutils.get_fp() + 'build/windows-build'):
shutil.rmtree(armutils.get_fp() + 'build/windows-build')
bpy.data.worlds['Arm'].arm_recompile_trigger = True
def update_gapi_linux(self, context):
if os.path.isdir(armutils.get_fp() + 'build/linux-build'):
shutil.rmtree(armutils.get_fp() + 'build/linux-build')
bpy.data.worlds['Arm'].arm_recompile_trigger = True
def update_gapi_mac(self, context):
if os.path.isdir(armutils.get_fp() + 'build/osx-build'):
shutil.rmtree(armutils.get_fp() + 'build/osx-build')
bpy.data.worlds['Arm'].arm_recompile_trigger = True
def update_gapi_android(self, context):
if os.path.isdir(armutils.get_fp() + 'build/android-build'):
shutil.rmtree(armutils.get_fp() + 'build/android-build')
bpy.data.worlds['Arm'].arm_recompile_trigger = True
def update_gapi_ios(self, context):
if os.path.isdir(armutils.get_fp() + 'build/ios-build'):
shutil.rmtree(armutils.get_fp() + 'build/ios-build')
bpy.data.worlds['Arm'].arm_recompile_trigger = True
def update_gapi_html5(self, context):
bpy.data.worlds['Arm'].arm_recompile_trigger = True
arm_ver = '17.01.1'
def init_properties():
global arm_ver
@ -116,26 +146,26 @@ def init_properties():
('direct3d9', 'Direct3D9', 'direct3d9'),
('direct3d11', 'Direct3D11', 'direct3d11'),
('direct3d12', 'Direct3D12', 'direct3d12')],
name="Graphics API", default='opengl2', description='Based on currently selected target')
name="Graphics API", default='opengl2', description='Based on currently selected target', update=update_gapi_win)
bpy.types.World.arm_gapi_linux = EnumProperty(
items = [('opengl2', 'OpenGL', 'opengl2'),
('vulkan', 'Vulkan', 'vulkan')],
name="Graphics API", default='opengl2', description='Based on currently selected target')
name="Graphics API", default='opengl2', description='Based on currently selected target', update=update_gapi_linux)
bpy.types.World.arm_gapi_android = EnumProperty(
items = [('opengl2', 'OpenGL', 'opengl2'),
('vulkan', 'Vulkan', 'vulkan')],
name="Graphics API", default='opengl2', description='Based on currently selected target')
name="Graphics API", default='opengl2', description='Based on currently selected target', update=update_gapi_android)
bpy.types.World.arm_gapi_mac = EnumProperty(
items = [('opengl2', 'OpenGL', 'opengl2'),
('metal', 'Metal', 'metal')],
name="Graphics API", default='opengl2', description='Based on currently selected target')
name="Graphics API", default='opengl2', description='Based on currently selected target', update=update_gapi_mac)
bpy.types.World.arm_gapi_ios = EnumProperty(
items = [('opengl2', 'OpenGL', 'opengl2'),
('metal', 'Metal', 'metal')],
name="Graphics API", default='opengl2', description='Based on currently selected target')
name="Graphics API", default='opengl2', description='Based on currently selected target', update=update_gapi_ios)
bpy.types.World.arm_gapi_html5 = EnumProperty(
items = [('webgl', 'WebGL', 'webgl')],
name="Graphics API", default='webgl', description='Based on currently selected target')
name="Graphics API", default='webgl', description='Based on currently selected target', update=update_gapi_html5)
# For object
bpy.types.Object.instanced_children = bpy.props.BoolProperty(name="Instanced Children", description="Use instaced rendering", default=False, update=invalidate_mesh_cache)