Skip to content

Commit 511dff9

Browse files
RaananWRaananW
committed
Merge remote-tracking branch 'BabylonJS/master' into orientation-fix
2 parents 1727143 + 3982f1a commit 511dff9

File tree

13 files changed

+19773
-10854
lines changed

13 files changed

+19773
-10854
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ ipch/
4444
*.ncb
4545
*.opensdf
4646
*.sdf
47+
*.VC.db
48+
*.VC.opendb
4749

4850
# Visual Studio profiler
4951
*.psess

‎Exporters/3ds Max/BabylonExport.Entities/BabylonMesh.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ public class BabylonMesh : BabylonAbstractMesh
5050
[DataMember]
5151
public float[] matricesWeights { get; set; }
5252

53+
[DataMember]
54+
public int[] matricesIndicesExtra { get; set; }
55+
56+
[DataMember]
57+
public float[] matricesWeightsExtra { get; set; }
58+
5359
[DataMember]
5460
public int[] indices { get; set; }
5561

@@ -77,6 +83,9 @@ public class BabylonMesh : BabylonAbstractMesh
7783
[DataMember]
7884
public int skeletonId { get; set; }
7985

86+
[DataMember]
87+
public int numBoneInfluencers { get; set; }
88+
8089
[DataMember]
8190
public bool showBoundingBox { get; set; }
8291

Exporters/3ds Max/Max2Babylon-0.4.6.zip renamed to Exporters/3ds Max/Max2Babylon-0.4.8.zip

2.71 MB
Binary file not shown.

‎Exporters/3ds Max/Max2Babylon/2017/Max2Babylon2017.csproj‎

Lines changed: 277 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,277 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{2F49C726-A1F8-40D4-859F-1355949608DC}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>Max2Babylon</RootNamespace>
11+
<AssemblyName>Max2Babylon</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
15+
<SccProjectName>SAK</SccProjectName>
16+
<SccLocalPath>SAK</SccLocalPath>
17+
<SccAuxPath>SAK</SccAuxPath>
18+
<SccProvider>SAK</SccProvider>
19+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
20+
<RestorePackages>true</RestorePackages>
21+
</PropertyGroup>
22+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
23+
<DebugSymbols>true</DebugSymbols>
24+
<DebugType>full</DebugType>
25+
<Optimize>false</Optimize>
26+
<OutputPath>C:\Program Files\Autodesk\3ds Max 2017\bin\assemblies\</OutputPath>
27+
<DefineConstants>TRACE;DEBUG;MAX2017</DefineConstants>
28+
<ErrorReport>prompt</ErrorReport>
29+
<WarningLevel>4</WarningLevel>
30+
<Prefer32Bit>false</Prefer32Bit>
31+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
32+
</PropertyGroup>
33+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
34+
<DebugType>pdbonly</DebugType>
35+
<Optimize>true</Optimize>
36+
<OutputPath>C:\Program Files\Autodesk\3ds Max 2013\bin\assemblies\</OutputPath>
37+
<DefineConstants>TRACE;MAX2015</DefineConstants>
38+
<ErrorReport>prompt</ErrorReport>
39+
<WarningLevel>4</WarningLevel>
40+
<Prefer32Bit>false</Prefer32Bit>
41+
</PropertyGroup>
42+
<ItemGroup>
43+
<Reference Include="Autodesk.Max, Version=17.0.630.0, Culture=neutral, processorArchitecture=MSIL">
44+
<SpecificVersion>False</SpecificVersion>
45+
<HintPath>..\..\..\..\..\Repos\Babylon.js\Exporters\3ds Max\Max2Babylon\2015\Refs\Autodesk.Max.dll</HintPath>
46+
<Private>False</Private>
47+
</Reference>
48+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
49+
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
50+
<Private>True</Private>
51+
</Reference>
52+
<Reference Include="SharpDX, Version=2.4.2.0, Culture=neutral, PublicKeyToken=627a3d6d1956f55a, processorArchitecture=MSIL">
53+
<SpecificVersion>False</SpecificVersion>
54+
<HintPath>..\..\BabylonExport.Core\Refs\SharpDX.dll</HintPath>
55+
</Reference>
56+
<Reference Include="System" />
57+
<Reference Include="System.Core" />
58+
<Reference Include="System.Drawing" />
59+
<Reference Include="System.Runtime.Serialization" />
60+
<Reference Include="System.Web" />
61+
<Reference Include="System.Windows.Forms" />
62+
<Reference Include="System.Data.DataSetExtensions" />
63+
<Reference Include="Microsoft.CSharp" />
64+
<Reference Include="System.Data" />
65+
<Reference Include="System.Xml" />
66+
</ItemGroup>
67+
<ItemGroup>
68+
<Compile Include="..\BabylonActionCallback.cs">
69+
<Link>BabylonActionCallback.cs</Link>
70+
</Compile>
71+
<Compile Include="..\BabylonExportActionItem.cs">
72+
<Link>BabylonExportActionItem.cs</Link>
73+
</Compile>
74+
<Compile Include="..\BabylonPropertiesActionItem.cs">
75+
<Link>BabylonPropertiesActionItem.cs</Link>
76+
</Compile>
77+
<Compile Include="..\Descriptor.cs">
78+
<Link>Descriptor.cs</Link>
79+
</Compile>
80+
<Compile Include="..\Exporter\ActionBuilder\BabylonActionsBuilderActionItem.cs">
81+
<Link>Exporter\ActionBuilder\BabylonActionsBuilderActionItem.cs</Link>
82+
</Compile>
83+
<Compile Include="..\Exporter\ActionBuilder\BabylonExporter.Action.cs">
84+
<Link>Exporter\ActionBuilder\BabylonExporter.Action.cs</Link>
85+
</Compile>
86+
<Compile Include="..\Exporter\BabylonExporter.Animation.cs">
87+
<Link>Exporter\BabylonExporter.Animation.cs</Link>
88+
</Compile>
89+
<Compile Include="..\Exporter\BabylonExporter.Camera.cs">
90+
<Link>Exporter\BabylonExporter.Camera.cs</Link>
91+
</Compile>
92+
<Compile Include="..\Exporter\BabylonExporter.cs">
93+
<Link>Exporter\BabylonExporter.cs</Link>
94+
</Compile>
95+
<Compile Include="..\Exporter\BabylonExporter.Light.cs">
96+
<Link>Exporter\BabylonExporter.Light.cs</Link>
97+
</Compile>
98+
<Compile Include="..\Exporter\BabylonExporter.Material.cs">
99+
<Link>Exporter\BabylonExporter.Material.cs</Link>
100+
</Compile>
101+
<Compile Include="..\Exporter\BabylonExporter.Mesh.cs">
102+
<Link>Exporter\BabylonExporter.Mesh.cs</Link>
103+
</Compile>
104+
<Compile Include="..\Exporter\BabylonExporter.ShadowGenerator.cs">
105+
<Link>Exporter\BabylonExporter.ShadowGenerator.cs</Link>
106+
</Compile>
107+
<Compile Include="..\Exporter\BabylonExporter.Skeleton.cs">
108+
<Link>Exporter\BabylonExporter.Skeleton.cs</Link>
109+
</Compile>
110+
<Compile Include="..\Exporter\BabylonExporter.Texture.cs">
111+
<Link>Exporter\BabylonExporter.Texture.cs</Link>
112+
</Compile>
113+
<Compile Include="..\Exporter\GlobalVertex.cs">
114+
<Link>Exporter\GlobalVertex.cs</Link>
115+
</Compile>
116+
<Compile Include="..\Forms\ActionsBuilderForm.cs">
117+
<Link>Forms\ActionsBuilderForm.cs</Link>
118+
<SubType>Form</SubType>
119+
</Compile>
120+
<Compile Include="..\Forms\ActionsBuilderForm.designer.cs">
121+
<Link>Forms\ActionsBuilderForm.designer.cs</Link>
122+
<DependentUpon>ActionsBuilderForm.cs</DependentUpon>
123+
</Compile>
124+
<Compile Include="..\Forms\CameraPropertiesForm.cs">
125+
<Link>Forms\CameraPropertiesForm.cs</Link>
126+
<SubType>Form</SubType>
127+
</Compile>
128+
<Compile Include="..\Forms\CameraPropertiesForm.Designer.cs">
129+
<Link>Forms\CameraPropertiesForm.Designer.cs</Link>
130+
<DependentUpon>CameraPropertiesForm.cs</DependentUpon>
131+
</Compile>
132+
<Compile Include="..\Forms\ExporterForm.cs">
133+
<Link>Forms\ExporterForm.cs</Link>
134+
<SubType>Form</SubType>
135+
</Compile>
136+
<Compile Include="..\Forms\ExporterForm.Designer.cs">
137+
<Link>Forms\ExporterForm.Designer.cs</Link>
138+
<DependentUpon>ExporterForm.cs</DependentUpon>
139+
</Compile>
140+
<Compile Include="..\Forms\LightPropertiesForm.cs">
141+
<Link>Forms\LightPropertiesForm.cs</Link>
142+
<SubType>Form</SubType>
143+
</Compile>
144+
<Compile Include="..\Forms\LightPropertiesForm.Designer.cs">
145+
<Link>Forms\LightPropertiesForm.Designer.cs</Link>
146+
<DependentUpon>LightPropertiesForm.cs</DependentUpon>
147+
</Compile>
148+
<Compile Include="..\Forms\ObjectPropertiesForm.cs">
149+
<Link>Forms\ObjectPropertiesForm.cs</Link>
150+
<SubType>Form</SubType>
151+
</Compile>
152+
<Compile Include="..\Forms\ObjectPropertiesForm.Designer.cs">
153+
<Link>Forms\ObjectPropertiesForm.Designer.cs</Link>
154+
<DependentUpon>ObjectPropertiesForm.cs</DependentUpon>
155+
</Compile>
156+
<Compile Include="..\Forms\ScenePropertiesForm.cs">
157+
<Link>Forms\ScenePropertiesForm.cs</Link>
158+
<SubType>Form</SubType>
159+
</Compile>
160+
<Compile Include="..\Forms\ScenePropertiesForm.Designer.cs">
161+
<Link>Forms\ScenePropertiesForm.Designer.cs</Link>
162+
<DependentUpon>ScenePropertiesForm.cs</DependentUpon>
163+
</Compile>
164+
<Compile Include="..\Forms\Vector3Control.cs">
165+
<Link>Forms\Vector3Control.cs</Link>
166+
<SubType>UserControl</SubType>
167+
</Compile>
168+
<Compile Include="..\Forms\Vector3Control.Designer.cs">
169+
<Link>Forms\Vector3Control.Designer.cs</Link>
170+
<DependentUpon>Vector3Control.cs</DependentUpon>
171+
</Compile>
172+
<Compile Include="..\GlobalUtility.cs">
173+
<Link>GlobalUtility.cs</Link>
174+
</Compile>
175+
<Compile Include="..\JsonTextWriterOptimized.cs">
176+
<Link>JsonTextWriterOptimized.cs</Link>
177+
</Compile>
178+
<Compile Include="..\Loader.cs">
179+
<Link>Loader.cs</Link>
180+
</Compile>
181+
<Compile Include="..\Tools\Tools.cs">
182+
<Link>Tools\Tools.cs</Link>
183+
</Compile>
184+
<Compile Include="..\Tools\VNormal.cs">
185+
<Link>Tools\VNormal.cs</Link>
186+
</Compile>
187+
<Compile Include="..\Tools\WebServer.cs">
188+
<Link>Tools\WebServer.cs</Link>
189+
</Compile>
190+
<Compile Include="Properties\AssemblyInfo.cs" />
191+
<Compile Include="Properties\Resources.Designer.cs">
192+
<AutoGen>True</AutoGen>
193+
<DesignTime>True</DesignTime>
194+
<DependentUpon>Resources.resx</DependentUpon>
195+
</Compile>
196+
</ItemGroup>
197+
<ItemGroup>
198+
<Content Include="Refs\Autodesk.Max.dll" />
199+
</ItemGroup>
200+
<ItemGroup>
201+
<EmbeddedResource Include="..\Forms\ActionsBuilderForm.resx">
202+
<Link>Forms\ActionsBuilderForm.resx</Link>
203+
<DependentUpon>ActionsBuilderForm.cs</DependentUpon>
204+
</EmbeddedResource>
205+
<EmbeddedResource Include="..\Forms\CameraPropertiesForm.resx">
206+
<Link>Forms\CameraPropertiesForm.resx</Link>
207+
<DependentUpon>CameraPropertiesForm.cs</DependentUpon>
208+
</EmbeddedResource>
209+
<EmbeddedResource Include="..\Forms\ExporterForm.resx">
210+
<Link>Forms\ExporterForm.resx</Link>
211+
<DependentUpon>ExporterForm.cs</DependentUpon>
212+
</EmbeddedResource>
213+
<EmbeddedResource Include="..\Forms\LightPropertiesForm.resx">
214+
<Link>Forms\LightPropertiesForm.resx</Link>
215+
<DependentUpon>LightPropertiesForm.cs</DependentUpon>
216+
</EmbeddedResource>
217+
<EmbeddedResource Include="..\Forms\ObjectPropertiesForm.resx">
218+
<Link>Forms\ObjectPropertiesForm.resx</Link>
219+
<DependentUpon>ObjectPropertiesForm.cs</DependentUpon>
220+
</EmbeddedResource>
221+
<EmbeddedResource Include="..\Forms\ScenePropertiesForm.resx">
222+
<Link>Forms\ScenePropertiesForm.resx</Link>
223+
<DependentUpon>ScenePropertiesForm.cs</DependentUpon>
224+
</EmbeddedResource>
225+
<EmbeddedResource Include="..\Forms\Vector3Control.resx">
226+
<Link>Forms\Vector3Control.resx</Link>
227+
<DependentUpon>Vector3Control.cs</DependentUpon>
228+
</EmbeddedResource>
229+
<EmbeddedResource Include="Properties\Resources.resx">
230+
<Generator>ResXFileCodeGenerator</Generator>
231+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
232+
</EmbeddedResource>
233+
</ItemGroup>
234+
<ItemGroup>
235+
<ProjectReference Include="..\..\BabylonExport.Entities\BabylonExport.Entities.csproj">
236+
<Project>{6150965a-658c-4263-89ad-4f980eb0675d}</Project>
237+
<Name>BabylonExport.Entities</Name>
238+
</ProjectReference>
239+
<ProjectReference Include="..\..\BabylonFileConverter\BabylonFileConverter.csproj">
240+
<Project>{a6b76356-1d1c-4c82-8199-a6406da85a95}</Project>
241+
<Name>BabylonFileConverter</Name>
242+
</ProjectReference>
243+
</ItemGroup>
244+
<ItemGroup>
245+
<WCFMetadata Include="Service References\" />
246+
</ItemGroup>
247+
<ItemGroup>
248+
<None Include="packages.config" />
249+
</ItemGroup>
250+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
251+
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
252+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
253+
<PropertyGroup>
254+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
255+
</PropertyGroup>
256+
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
257+
</Target>
258+
<PropertyGroup>
259+
<PostBuildEvent>mkdir "$(OutDir)BabylonActionsBuilder"
260+
mkdir "$(OutDir)BabylonActionsBuilder\fonts"
261+
mkdir "$(OutDir)BabylonActionsBuilder\fonts\SinkinSans"
262+
copy "$(SolutionDir)ActionsBuilder\Sources\fonts.css" "$(OutDir)BabylonActionsBuilder\fonts.css"
263+
copy "$(SolutionDir)ActionsBuilder\Sources\index.css" "$(OutDir)BabylonActionsBuilder\index.css"
264+
copy "$(SolutionDir)ActionsBuilder\Sources\index.html" "$(OutDir)BabylonActionsBuilder\index.html"
265+
copy "$(SolutionDir)ActionsBuilder\Sources\actionsbuilder.max.js" "$(OutDir)BabylonActionsBuilder\actionsbuilder.max.js"
266+
copy "$(SolutionDir)ActionsBuilder\Sources\raphael.js" "$(OutDir)BabylonActionsBuilder\raphael.js"
267+
copy "$(SolutionDir)babylon.max.js" "$(OutDir)BabylonActionsBuilder\babylon.max.js"
268+
copy "$(SolutionDir)ActionsBuilder\Sources\fonts\SinkinSans\" "$(OutDir)BabylonActionsBuilder\fonts\SinkinSans\"</PostBuildEvent>
269+
</PropertyGroup>
270+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
271+
Other similar extension points exist, see Microsoft.Common.targets.
272+
<Target Name="BeforeBuild">
273+
</Target>
274+
<Target Name="AfterBuild">
275+
</Target>
276+
-->
277+
</Project>

‎Exporters/3ds Max/Max2Babylon/2017/Properties/AssemblyInfo.cs‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
using System.Reflection;
2+
using System.Runtime.CompilerServices;
3+
using System.Runtime.InteropServices;
4+
5+
// General Information about an assembly is controlled through the following
6+
// set of attributes. Change these attribute values to modify the information
7+
// associated with an assembly.
8+
[assembly: AssemblyTitle("Max2Babylon")]
9+
[assembly: AssemblyDescription("")]
10+
[assembly: AssemblyConfiguration("")]
11+
[assembly: AssemblyCompany("")]
12+
[assembly: AssemblyProduct("Max2Babylon")]
13+
[assembly: AssemblyCopyright("Copyright © 2014")]
14+
[assembly: AssemblyTrademark("")]
15+
[assembly: AssemblyCulture("")]
16+
17+
// Setting ComVisible to false makes the types in this assembly not visible
18+
// to COM components. If you need to access a type in this assembly from
19+
// COM, set the ComVisible attribute to true on that type.
20+
[assembly: ComVisible(false)]
21+
22+
// The following GUID is for the ID of the typelib if this project is exposed to COM
23+
[assembly: Guid("2d621b1c-3661-49bd-8dd3-4c5de51fce94")]
24+
25+
// Version information for an assembly consists of the following four values:
26+
//
27+
// Major Version
28+
// Minor Version
29+
// Build Number
30+
// Revision
31+
//
32+
// You can specify all the values or you can default the Build and Revision Numbers
33+
// by using the '*' as shown below:
34+
// [assembly: AssemblyVersion("1.0.*")]
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]

0 commit comments

Comments
 (0)