mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-29 19:00:07 +02:00
Code Issues Projects Releases Wiki Activity

Added support for Matt's teamcolour texture transparency to the g3d blender exporter #166 . [skip ci]

Browse Source
This commit is contained in:
Jammyjamjamman
2018-06-24 18:10:58 +01:00
parent 91af4e3dd3
commit f06d594db6
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/tools/glexemel/g3d_support.py
View File

@@ -199,7 +199,7 @@ class G3DMeshHeaderv3: #Read Meshheader
self.customalpha = True self.customalpha = True
else: else:
self.customalpha = False self.customalpha = False
class G3DMeshHeaderv4: #Read Meshheader class G3DMeshHeaderv4: #Read Meshheader
binary_format = "<64c3I8f2I" binary_format = "<64c3I8f2I"
texname_format = "<64c" texname_format = "<64c"
@@ -227,6 +227,10 @@ class G3DMeshHeaderv4: #Read Meshheader
self.istwosided = bool(self.properties & 2) self.istwosided = bool(self.properties & 2)
self.noselect = bool(self.properties & 4) self.noselect = bool(self.properties & 4)
self.glow = bool(self.properties & 8) self.glow = bool(self.properties & 8)
# Get last 8 bits for teamcolor transparency.
# The value is inverted for compatibility with megaglest.
self.teamcoloralpha = 255 - (self.properties >> 24)
self.hastexture = False self.hastexture = False
self.diffusetexture = None self.diffusetexture = None
@@ -360,6 +364,7 @@ def createMesh(filename, header, data, toblender, operator):
if header.isv4: if header.isv4:
mesh.g3d_noSelect = header.noselect mesh.g3d_noSelect = header.noselect
mesh.g3d_glow = header.glow mesh.g3d_glow = header.glow
mesh.teamcolor_alpha = header.teamcoloralpha
else: else:
mesh.g3d_noSelect = False mesh.g3d_noSelect = False
mesh.glow = False mesh.glow = False
@@ -528,6 +533,7 @@ def G3DLoader(filepath, toblender, operator): #Main Import Routine
print ("specularcolor : %1.6f %1.6f %1.6f" %meshheader.specularcolor) print ("specularcolor : %1.6f %1.6f %1.6f" %meshheader.specularcolor)
print ("specularpower : %1.6f" %meshheader.specularpower) print ("specularpower : %1.6f" %meshheader.specularpower)
print ("opacity : %1.6f" %meshheader.opacity) print ("opacity : %1.6f" %meshheader.opacity)
print ("teamcoloralpha : %d" %meshheader.teamcoloralpha)
print ("properties : " + str(meshheader.properties)) print ("properties : " + str(meshheader.properties))
print ("textures : " + str(meshheader.textures)) print ("textures : " + str(meshheader.textures))
print ("texturename : " + str(meshheader.diffusetexture)) print ("texturename : " + str(meshheader.diffusetexture))
@@ -704,13 +710,14 @@ def G3DSaver(filepath, context, toglest, operator):
properties = 0 properties = 0
if mesh.g3d_customColor: if mesh.g3d_customColor:
properties |= 1 properties |= 1
properties |= (255 - mesh.teamcolor_alpha) << 24
if mesh.show_double_sided: if mesh.show_double_sided:
properties |= 2 properties |= 2
if mesh.g3d_noSelect: if mesh.g3d_noSelect:
properties |= 4 properties |= 4
if mesh.g3d_glow: if mesh.g3d_glow:
properties |= 8 properties |= 8
#MeshData #MeshData
vertices = [] vertices = []
normals = [] normals = []
@@ -784,13 +791,15 @@ class G3DPanel(bpy.types.Panel):
bl_space_type = 'PROPERTIES' bl_space_type = 'PROPERTIES'
bl_region_type = 'WINDOW' bl_region_type = 'WINDOW'
bl_context = "data" bl_context = "data"
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
return (context.object is not None and context.object.type == 'MESH') return (context.object is not None and context.object.type == 'MESH')
def draw(self, context): def draw(self, context):
self.layout.prop(context.object.data, "g3d_customColor") self.layout.prop(context.object.data, "g3d_customColor")
col = self.layout.column()
col.prop(context.object.data, "teamcolor_alpha")
col.enabled = context.object.data.g3d_customColor
self.layout.prop(context.object.data, "show_double_sided", text="double sided") self.layout.prop(context.object.data, "show_double_sided", text="double sided")
self.layout.prop(context.object.data, "g3d_noSelect") self.layout.prop(context.object.data, "g3d_noSelect")
self.layout.prop(context.object.data, "g3d_fullyOpaque") self.layout.prop(context.object.data, "g3d_fullyOpaque")
@@ -900,6 +909,11 @@ def register():
bpy.types.Mesh.g3d_glow = bpy.props.BoolProperty( bpy.types.Mesh.g3d_glow = bpy.props.BoolProperty(
name="glow", name="glow",
description="let objects glow like particles") description="let objects glow like particles")
bpy.types.Mesh.teamcolor_alpha = bpy.props.IntProperty(
name="team color alpha",
description="set the transparency of the teamcolor part of the texture only",
default=0,
min=0, max=2**8-1)
bpy.utils.register_module(__name__) bpy.utils.register_module(__name__)