diff --git a/P3D/Content/Data/maps/structures/SeaPlane.dat b/P3D/Content/Data/maps/structures/SeaPlane.dat new file mode 100644 index 000000000..5d0557270 Binary files /dev/null and b/P3D/Content/Data/maps/structures/SeaPlane.dat differ diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj index 7335e79f6..1e81d8832 100644 --- a/P3D/P3D.vbproj +++ b/P3D/P3D.vbproj @@ -28867,12 +28867,15 @@ PreserveNewest - + PreserveNewest - - + + PreserveNewest - + + + PreserveNewest + PreserveNewest @@ -28954,6 +28957,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest diff --git a/lib/P3D.ContentPipeline/Content/Content.mgcb b/lib/P3D.ContentPipeline/Content/Content.mgcb index 0e6c2f520..93eb94ea9 100644 --- a/lib/P3D.ContentPipeline/Content/Content.mgcb +++ b/lib/P3D.ContentPipeline/Content/Content.mgcb @@ -278,6 +278,44 @@ /processorParam:TextureFormat=Color /build:Models/Pokemon/Snorlax/Shiny.fbx +#begin Models/SeaPlane/SeaPlane.fbx +/importer:FbxImporter +/processor:ModelProcessor +/processorParam:ColorKeyColor=0,0,0,0 +/processorParam:ColorKeyEnabled=True +/processorParam:DefaultEffect=BasicEffect +/processorParam:GenerateMipmaps=False +/processorParam:GenerateTangentFrames=False +/processorParam:PremultiplyTextureAlpha=True +/processorParam:PremultiplyVertexColors=True +/processorParam:ResizeTexturesToPowerOfTwo=False +/processorParam:RotationX=0 +/processorParam:RotationY=0 +/processorParam:RotationZ=0 +/processorParam:Scale=1 +/processorParam:SwapWindingOrder=False +/processorParam:TextureFormat=Color +/build:Models/SeaPlane/SeaPlane.fbx + +#begin Models/SeaPlane/SeaPlane_Propeller.fbx +/importer:FbxImporter +/processor:ModelProcessor +/processorParam:ColorKeyColor=0,0,0,0 +/processorParam:ColorKeyEnabled=True +/processorParam:DefaultEffect=BasicEffect +/processorParam:GenerateMipmaps=True +/processorParam:GenerateTangentFrames=False +/processorParam:PremultiplyTextureAlpha=True +/processorParam:PremultiplyVertexColors=True +/processorParam:ResizeTexturesToPowerOfTwo=False +/processorParam:RotationX=0 +/processorParam:RotationY=0 +/processorParam:RotationZ=0 +/processorParam:Scale=1 +/processorParam:SwapWindingOrder=False +/processorParam:TextureFormat=Color +/build:Models/SeaPlane/SeaPlane_Propeller.fbx + #begin Models/Snorlax/Normal.fbx /importer:FbxImporter /processor:ModelProcessor diff --git a/lib/P3D.ContentPipeline/Content/Models/SeaPlane/SeaPlane.fbx b/lib/P3D.ContentPipeline/Content/Models/SeaPlane/SeaPlane.fbx new file mode 100644 index 000000000..addd9387c Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Models/SeaPlane/SeaPlane.fbx differ diff --git a/lib/P3D.ContentPipeline/Content/Models/SeaPlane/SeaPlane.png b/lib/P3D.ContentPipeline/Content/Models/SeaPlane/SeaPlane.png new file mode 100644 index 000000000..6c62ef2e4 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Models/SeaPlane/SeaPlane.png differ diff --git a/lib/P3D.ContentPipeline/Content/Models/SeaPlane/SeaPlane_Propeller.fbx b/lib/P3D.ContentPipeline/Content/Models/SeaPlane/SeaPlane_Propeller.fbx new file mode 100644 index 000000000..700dd5fa4 Binary files /dev/null and b/lib/P3D.ContentPipeline/Content/Models/SeaPlane/SeaPlane_Propeller.fbx differ diff --git a/lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj b/lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj index b110d60d0..fddeb722e 100644 --- a/lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj +++ b/lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj @@ -64,6 +64,8 @@ + + @@ -92,6 +94,7 @@ +