Merge pull request #57 from TwinFan/next

v3.1.0 Contrails

.gitignore

@@ -14,3 +14,7 @@ xcuserdata/
 *.mode2v3
 *.perspectivev3
 *.pbxuser
+
+# X-Plane particle system auto save files
+*.pss_autosave
+*.pss~

CMakeLists.txt

@@ -29,7 +29,7 @@ else()
 endif()
 
 project(XPMP2
-        VERSION 3.0.2
+        VERSION 3.1.0
         DESCRIPTION "Multiplayer library for X-Plane 11 and 12")
 
 # Provide compile macros from the above project version definition
@@ -149,6 +149,7 @@ add_library(XPMP2 STATIC
     src/AIMultiplayer.cpp
     src/Aircraft.h
     src/Aircraft.cpp
+    src/Contrail.cpp
     src/CSLCopy.cpp
     src/CSLModels.h
     src/CSLModels.cpp

Resources/Contrail/Contrail.obj

@@ -0,0 +1,8 @@
+I
+800
+OBJ
+# Contrail object: An empty object that only refers to the particle/emitter definition
+
+PARTICLE_SYSTEM Contrail.pss
+POINT_COUNTS 0 0 0 0
+EMITTER engine_smoke 0 0 0 0 0 0

Resources/Contrail/Contrail.pss

@@ -0,0 +1,176 @@
+A
+1000
+PARTICLE_SYSTEM
+
+ TEXTURE Contrail.png
+PARTICLE
+ NAME engine_smoke_persistent
+ MAX_PARTICLES 22500
+ BILLBOARD_MODE BILLBOARD
+ BLEND_MODE ADD
+ TEX_CELLS_X 1
+ TEX_CELLS_Y 1
+ ANIM_CELL_START 0
+ ANIM_CELL_COUNT 1
+ ANIM_CELL_REPEAT 1
+ ANIM_CELL_RANDOM 0
+ANIM_CELL_KF
+INTERP_MODE LINEAR
+	0.000000	0.000000
+	0.250000	0.000000
+	0.500000	0.000000
+	1.000000	0.000000
+END_KEYFRAME_TABLE
+SIZE_CURVE
+INTERP_MODE CUBIC_AVG
+	0.000000	5.000000
+	0.152252	6.000000
+	0.482219	10.000000
+	1.000000	10.000000
+END_KEYFRAME_TABLE
+ALPHA_CURVE
+INTERP_MODE LINEAR
+	0.000000	0.000000
+	0.005000	0.000000
+	0.010000	0.020000
+	0.100000	0.600000
+	0.457855	0.600000
+	1.000000	0.000000
+END_KEYFRAME_TABLE
+LENGTH_CURVE
+INTERP_MODE CUBIC_AVG
+	0.000000	0.000000
+	1.000000	0.000000
+END_KEYFRAME_TABLE
+ DIFFUSE 0.500000
+ AMBIENT 0.750000
+EMISSIVE
+INTERP_MODE CUBIC_AVG
+	0.000000	0.000000
+	1.000000	0.000000
+END_KEYFRAME_TABLE
+TINT
+INTERP_MODE CUBIC_AVG
+	0.000000	0.950000	0.970000	1.000000
+	1.000000	0.950000	0.970000	1.000000
+END_KEYFRAME_TABLE
+GRAVITY_CURVE
+INTERP_MODE CUBIC_AVG
+	0.000000	0.000000
+	1.000000	0.000000
+END_KEYFRAME_TABLE
+TURBULENCE
+INTERP_MODE CUBIC_AVG
+	0.000000	0.000000
+	1.000000	0.075000
+END_KEYFRAME_TABLE
+DRAG_CURVE
+INTERP_MODE CUBIC_AVG
+	0.000000	0.500000
+	0.200000	0.750000
+	1.000000	1.000000
+END_KEYFRAME_TABLE
+SPIN_CURVE
+INTERP_MODE CUBIC_AVG
+	0.000000	0.400000
+	0.050000	0.200000
+	0.250000	0.100000
+	1.000000	0.050000
+END_KEYFRAME_TABLE
+ELASTICITY
+INTERP_MODE CUBIC_AVG
+	0.000000	1.000000
+	1.000000	1.000000
+END_KEYFRAME_TABLE
+ COLLISION_MODE NONE
+END_PARTICLE
+EMITTER
+ NAME engine_smoke
+ EMIT_MODE STREAM
+SUB_EMITTER
+ PARTICLE_TYPE 0
+EMIT_RATE
+SLOT 1
+INTERP_MODE LINEAR
+	0.000000	0.000000	0.000000
+	0.090000	0.000000	0.000000
+	0.100000	50.000000	50.000000
+	1.000000	100.000000	100.000000
+END_KEYFRAME_TABLE
+INITIAL_SPEED
+SLOT 1
+INTERP_MODE LINEAR
+	0.000000	0.000000	0.000000
+	1.000000	500.000000	500.000000
+END_KEYFRAME_TABLE
+ROTATION_SPEED
+INTERP_MODE CUBIC_AVG
+	0.000000	1.000000	1.000000
+	1.000000	1.000000	1.000000
+END_KEYFRAME_TABLE
+INITIAL_HEADING
+INTERP_MODE CUBIC_AVG
+	0.000000	180.000000	180.000000
+	1.000000	180.000000	180.000000
+END_KEYFRAME_TABLE
+INITIAL_PITCH
+INTERP_MODE CUBIC_AVG
+	0.000000	0.000000	0.000000
+	1.000000	0.000000	0.000000
+END_KEYFRAME_TABLE
+DX
+INTERP_MODE LINEAR
+	0.000000	0.000000	0.000000
+	1.000000	0.000000	0.000000
+END_KEYFRAME_TABLE
+DY
+INTERP_MODE LINEAR
+	0.000000	0.000000	0.000000
+	1.000000	0.000000	0.000000
+END_KEYFRAME_TABLE
+DZ
+INTERP_MODE LINEAR
+	0.000000	0.000000	0.000000
+	1.000000	0.000000	0.000000
+END_KEYFRAME_TABLE
+DLON
+INTERP_MODE CUBIC_AVG
+	0.000000	10.000000	10.000000
+	1.000000	10.000000	10.000000
+END_KEYFRAME_TABLE
+DLAT
+INTERP_MODE CUBIC_AVG
+	0.000000	0.000000	0.000000
+	1.000000	0.000000	0.000000
+END_KEYFRAME_TABLE
+INITIAL_ROTATION
+INTERP_MODE CUBIC_AVG
+	0.000000	0.000000	0.000000
+	1.000000	0.000000	0.000000
+END_KEYFRAME_TABLE
+INITIAL_SIZE
+INTERP_MODE LINEAR
+	0.000000	1.000000	1.000000
+	1.000000	1.000000	1.000000
+END_KEYFRAME_TABLE
+INITIAL_ALPHA
+INTERP_MODE CUBIC_AVG
+	0.000000	1.000000	1.000000
+	1.000000	1.000000	1.000000
+END_KEYFRAME_TABLE
+TIME_TO_LIVE
+SLOT 2
+INTERP_MODE LINEAR
+	0.000000	0.000000	0.000000
+	180.000000	135.000000	180.000000
+END_KEYFRAME_TABLE
+END_SUB_EMITTER
+DATAREFS 3
+DREF 
+DREF libxplanemp/controls/thrust_ratio
+DREF libxplanemp/contrail/lifetime
+END_EMITTER
+ TEX_CELLS_X 1
+ TEX_CELLS_Y 1
+DATAREFS 0
+END_PARTICLE_SYSTEM

XPMP2.xcodeproj/project.pbxproj

@@ -34,6 +34,7 @@
 		25EC1C4223BF6DFA000940BB /* CSLModels.h in Headers */ = {isa = PBXBuildFile; fileRef = 25EC1C4123BF6DFA000940BB /* CSLModels.h */; };
 		25EC1C4723BF7569000940BB /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 25EC1C4523BF7569000940BB /* Utilities.cpp */; };
 		25EC1C4823BF7569000940BB /* Utilities.h in Headers */ = {isa = PBXBuildFile; fileRef = 25EC1C4623BF7569000940BB /* Utilities.h */; };
+		25F070792956406100065969 /* Contrail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 25F070782956406100065969 /* Contrail.cpp */; };
 		25FF33FE23BFF250001B0AB4 /* Aircraft.h in Headers */ = {isa = PBXBuildFile; fileRef = 25FF33FD23BFF250001B0AB4 /* Aircraft.h */; };
 /* End PBXBuildFile section */
 
@@ -95,6 +96,8 @@
 		25EC1C4123BF6DFA000940BB /* CSLModels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSLModels.h; sourceTree = "<group>"; };
 		25EC1C4523BF7569000940BB /* Utilities.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utilities.cpp; sourceTree = "<group>"; };
 		25EC1C4623BF7569000940BB /* Utilities.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utilities.h; sourceTree = "<group>"; };
+		25F070782956406100065969 /* Contrail.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Contrail.cpp; sourceTree = "<group>"; };
+		25F0707B29564E5800065969 /* Contrail.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Contrail.h; sourceTree = "<group>"; };
 		25FF33FD23BFF250001B0AB4 /* Aircraft.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Aircraft.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -181,6 +184,8 @@
 				252C01F323E62040007C231F /* AIMultiplayer.h */,
 				2599B91823BF636E00F92BB5 /* Aircraft.cpp */,
 				25FF33FD23BFF250001B0AB4 /* Aircraft.h */,
+				25F070782956406100065969 /* Contrail.cpp */,
+				25F0707B29564E5800065969 /* Contrail.h */,
 				256DC2F624F3141500C1595C /* CSLCopy.cpp */,
 				25EC1C3F23BF6DF1000940BB /* CSLModels.cpp */,
 				25EC1C4123BF6DFA000940BB /* CSLModels.h */,
@@ -345,6 +350,7 @@
 				252C01F423E62040007C231F /* AIMultiplayer.cpp in Sources */,
 				2575F45523EDFC5E00747524 /* Map.cpp in Sources */,
 				25338211253A39060090E0B3 /* Network.cpp in Sources */,
+				25F070792956406100065969 /* Contrail.cpp in Sources */,
 				2599B91923BF636E00F92BB5 /* Aircraft.cpp in Sources */,
 				255EC99228E3871100F99F93 /* Sound.cpp in Sources */,
 			);
@@ -451,8 +457,8 @@
 					lib/fmod/inc,
 				);
 				XPMP2_VER_MAJOR = 3;
-				XPMP2_VER_MINOR = 0;
-				XPMP2_VER_PATCH = 2;
+				XPMP2_VER_MINOR = 1;
+				XPMP2_VER_PATCH = 0;
 				XPSDK_ROOT = lib/SDK;
 			};
 			name = Debug;
@@ -552,8 +558,8 @@
 					lib/fmod/inc,
 				);
 				XPMP2_VER_MAJOR = 3;
-				XPMP2_VER_MINOR = 0;
-				XPMP2_VER_PATCH = 2;
+				XPMP2_VER_MINOR = 1;
+				XPMP2_VER_PATCH = 0;
 				XPSDK_ROOT = lib/SDK;
 			};
 			name = Release;

XPMP2.xcodeproj/xcshareddata/xcschemes/XPMP2.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1410"
+   LastUpgradeVersion = "1420"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"