v1.13.0

Author: dtugend

advancedfx/__init__.py

@@ -3,7 +3,7 @@
 bl_info = {
 	"name": "advancedfx Blender Scripts",
 	"author": "advancedfx.org",
-	"version": (1, 12, 7),
+	"version": (1, 13, 0),
 	"blender": (2, 80, 0),
 	"location": "File > Import/Export",
 	"description": "For inter-operation with HLAE.",

advancedfx/export_cam.py

@@ -14,8 +14,7 @@ def FloatToBvhString(value):
 
 def WriteHeader(file, frames, frameTime):
 	file.write("advancedfx Cam\n")
-	file.write("version 1\n")
-	file.write("scaleFov none\n")
+	file.write("version 2\n")
 	file.write("channels time xPosition yPosition zPositon xRotation yRotation zRotation fov\n")
 	file.write("DATA\n")
 

advancedfx/import_agr.py

@@ -582,7 +582,7 @@ def createCamera(self, context, camName):
 			o.rotation_mode = 'QUATERNION'
 
 
-		# Create actions and their curves (boobs):
+		# Create actions and their curves:
 
 		o.animation_data_create()
 		action = bpy.data.actions.new(name="game_data")

advancedfx/import_cam.py

@@ -19,16 +19,13 @@ def ReadLineWords(file):
 	return words
 
 def AlienSwarm_FovScaling(width, height, fov):
-	
 	if 0 == height:
 		return fov
-	
-	engineAspectRatio = width / height;
-	defaultAscpectRatio = 4.0 / 3.0;
-	ratio = engineAspectRatio / defaultAscpectRatio;
-	halfAngle = 0.5 * fov * (2.0 * math.pi / 360.0);
-	t = ratio * math.tan(halfAngle);
-	return 2.0 * math.atan(t) / (2.0 *  math.pi / 360.0);
+	engineAspectRatio = width / height
+	defaultAscpectRatio = 4.0 / 3.0
+	ratio = engineAspectRatio / defaultAscpectRatio
+	t = ratio * math.tan(math.radians(0.5 * fov))
+	return 2.0 * math.degrees(math.atan(t))
 
 class CameraData:
 	def __init__(self,o,c):
@@ -76,9 +73,8 @@ def invoke(self, context, event):
 
 	def createCamera(self, context, camName):
 
-		camBData = bpy.data.cameras.new(camName)
-		o = bpy.data.objects.new(camName, camBData)
-		c = bpy.data.cameras[o.name]
+		c = bpy.data.cameras.new(camName)
+		o = bpy.data.objects.new(camName, c)
 
 		context.scene.collection.objects.link(o)
 
@@ -91,7 +87,7 @@ def createCamera(self, context, camName):
 			o.rotation_mode = 'QUATERNION'
 
 
-		# Create actions and their curves (boobs):
+		# Create actions and their curves:
 
 		o.animation_data_create()
 		action = bpy.data.actions.new(name="game_data")
@@ -108,28 +104,17 @@ def createCamera(self, context, camName):
 		c.animation_data.action = action
 
 		camData.curves.append(action.fcurves.new("lens"))
-			
-		return camData
-	
-	# <returns> Camera FOV in radians </returns>
-	def calcCameraFov(self):
-		fov = math.radians(self.cameraFov)
-	
-		if self.scaleFov:
-			defaultAspectRatio = 4.0/3.0
-			engineAspectRatio = (self.screenWidth / self.screenHeight) if 0 != self.screenHeight else defaultAspectRatio
-			ratio = engineAspectRatio / defaultAspectRatio
-			halfAngle = fov * 0.5
-			fov = math.atan(math.tan(halfAngle) * ratio) * 2.0
 
-		return fov
+		return camData
 
 	def readCam(self, context):
 		fps = context.scene.render.fps
 
 		width = context.scene.render.pixel_aspect_x * context.scene.render.resolution_x
 		height = context.scene.render.pixel_aspect_y * context.scene.render.resolution_y
 
+		frame_end = None
+		
 		camData = self.createCamera(context,"afxCam")
 
 		if camData is None:
@@ -144,7 +129,7 @@ def readCam(self, context):
 			file = open(self.filepath, 'rU')
 
 			version = 0
-			scaleFov = 'none'
+			scaleFov = ''
 
 			words = ReadLineWords(file)
 
@@ -163,11 +148,11 @@ def readCam(self, context):
 					if 'scaleFov' == words[0] and 2 <= len(words):
 						scaleFov = words[1]
 
-			if(1 != version):
-				self.error("Invalid version, only 1 is supported.")
+			if(version < 1 or version > 2):
+				self.error("Invalid version, only 1 - 2 are supported.")
 				return False
 
-			if not(scaleFov in ['none', 'alienSwarm']):
+			if not(scaleFov in ['','none', 'alienSwarm']):
 				self.error("Unsupported scaleFov value.")
 				return False
 
@@ -191,6 +176,8 @@ def readCam(self, context):
 
 				time = 1.0 + time * fps
 
+				frame_end = int(math.ceil(time))
+				
 				renderOrigin = mathutils.Vector((-float(words[2]),float(words[1]),float(words[3]))) * self.global_scale
 				qAngle = afx_utils.QAngle(float(words[5]),float(words[6]),float(words[4]))
 
@@ -206,7 +193,8 @@ def readCam(self, context):
 
 				fov = float(words[7])
 
-				if 'alienSwarm' == scaleFov:
+				# none and alienSwarm was confused in version 1, version 2 always outputs real fov and doesn't have scaleFov.
+				if 'none' == scaleFov:
 					fov = AlienSwarm_FovScaling(width, height, fov)
 
 				lens = camData.c.sensor_width / (2.0 * math.tan(math.radians(fov) / 2.0))
@@ -218,6 +206,10 @@ def readCam(self, context):
 				afx_utils.AddKey_Rotation(self.interKey, curves[0+3].keyframe_points, curves[0+4].keyframe_points, curves[0+5].keyframe_points, curves[0+6].keyframe_points, time, quat)
 
 				afx_utils.AddKey_Value(self.interKey, curves[0+7].keyframe_points, time, lens)
+				
+			if frame_end is not None:
+				bpy.context.scene.frame_start = 1
+				bpy.context.scene.frame_end = frame_end
 
 		finally:
 			if file is not None:

advancedfx/readme.txt

@@ -50,6 +50,13 @@ For more informations visit it's Advancedfx Wiki page ( https://github.com/advan
 
 Changelog:
 
+1.13.0 (2021-09-17T05:17Z):
+- HLAE Camera IO (.cam):
+  - Added version 2 support for to import.
+  - Adjusted import to understand how HLAE mixes up the scaleFov for version 1 and fixed bugs.
+  - Updated export to version 2.
+  - Import now sets frame_begin and frame_end.
+
 1.12.7 (2021-08-31T16:04Z):
 - fixed decal_e sticker skipping