projects
/
carveJwlIkooP6JGAAIwe30JlM.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
review: player_common.h
[carveJwlIkooP6JGAAIwe30JlM.git]
/
blender_export.py
diff --git
a/blender_export.py
b/blender_export.py
index 32e548b4afa0d1583f4171949d0fec4e534b4886..2b059d9730b125ccba52973a9c1cb8145ce80bec 100644
(file)
--- a/
blender_export.py
+++ b/
blender_export.py
@@
-760,14
+760,18
@@
def sr_compile_material( mat ):
if mat.SR_data.shader == 'boundary':#{
m.shader = 6
#}
if mat.SR_data.shader == 'boundary':#{
m.shader = 6
#}
+
+ if mat.SR_data.shader == 'fxglow':#{
+ m.shader = 7
+ #}
inf = material_info( mat )
if mat.SR_data.shader == 'standard' or \
mat.SR_data.shader == 'standard_cutout' or \
mat.SR_data.shader == 'terrain_blend' or \
inf = material_info( mat )
if mat.SR_data.shader == 'standard' or \
mat.SR_data.shader == 'standard_cutout' or \
mat.SR_data.shader == 'terrain_blend' or \
- mat.SR_data.shader == 'vertex_blend'
:
- #{
+ mat.SR_data.shader == 'vertex_blend'
or \
+
mat.SR_data.shader == 'fxglow':
#{
if 'tex_diffuse' in inf:
m.tex_diffuse = sr_compile_texture(inf['tex_diffuse'])
#}
if 'tex_diffuse' in inf:
m.tex_diffuse = sr_compile_texture(inf['tex_diffuse'])
#}
@@
-3069,7
+3073,8
@@
class SR_MATERIAL_PROPERTIES(bpy.types.PropertyGroup):
('vertex_blend', "vertex_blend", ''),
('water',"water",''),
('invisible','Invisible',''),
('vertex_blend', "vertex_blend", ''),
('water',"water",''),
('invisible','Invisible',''),
- ('boundary','Boundary','')
+ ('boundary','Boundary',''),
+ ('fxglow','FX Glow',''),
])
surface_prop: bpy.props.EnumProperty(
])
surface_prop: bpy.props.EnumProperty(
@@
-3403,7
+3408,8
@@
def cv_draw_lines():
cv_view_shader, 'LINES', \
{ "pos":cv_view_verts, "color":cv_view_colours })
cv_view_shader, 'LINES', \
{ "pos":cv_view_verts, "color":cv_view_colours })
- lines.draw( cv_view_shader )
+ if bpy.context.scene.SR_data.gizmos:
+ lines.draw( cv_view_shader )
cv_view_verts = []
cv_view_colours = []
cv_view_verts = []
cv_view_colours = []
@@
-3480,8
+3486,8
@@
def draw_cone_twist( center, vx, vy, va ):
p0 = center + (axis + vx*c0 + vy*s0).normalized() * size
p1 = center + (axis + vx*c1 + vy*s1).normalized() * size
p0 = center + (axis + vx*c0 + vy*s0).normalized() * size
p1 = center + (axis + vx*c1 + vy*s1).normalized() * size
- col0 = ( abs(c0), abs(s0), 0.0
, 1.0
)
- col1 = ( abs(c1), abs(s1), 0.0
, 1.0
)
+ col0 = ( abs(c0), abs(s0), 0.0 )
+ col1 = ( abs(c1), abs(s1), 0.0 )
cv_view_verts += [center, p0, p0, p1]
cv_view_colours += [ (0,0,0), col0, col0, col1 ]
cv_view_verts += [center, p0, p0, p1]
cv_view_colours += [ (0,0,0), col0, col0, col1 ]