Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of https://github.com/BabylonJS/Babylon.js
# Conflicts:
#	dist/preview release/babylon.core.js
#	dist/preview release/babylon.d.ts
#	dist/preview release/babylon.js
#	dist/preview release/babylon.max.js
#	dist/preview release/babylon.noworker.js
  • Loading branch information
davrous committed Jan 11, 2017
2 parents 622feae + e7609ad commit b1cb781
Show file tree
Hide file tree
Showing 82 changed files with 8,501 additions and 4,343 deletions.
42 changes: 36 additions & 6 deletions .vscode/launch.json
Expand Up @@ -8,7 +8,22 @@
"url": "http://localhost:1338/Playground/index-local.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug"
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch playground (Chrome+WebGL 1.0 forced)",
"type": "chrome",
"request": "launch",
"url": "http://localhost:1338/Playground/index-local.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--disable-es3-apis"
]
},
{
"name": "Launch Materials Library (Chrome)",
Expand All @@ -17,7 +32,10 @@
"url": "http://localhost:1338/materialsLibrary/index.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug"
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Post Processes Library (Chrome)",
Expand All @@ -26,7 +44,10 @@
"url": "http://localhost:1338/postProcessLibrary/index.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug"
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Procedural Textures Library (Chrome)",
Expand All @@ -35,7 +56,10 @@
"url": "http://localhost:1338/proceduralTexturesLibrary/index.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug"
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Inspector (Chrome)",
Expand All @@ -44,7 +68,10 @@
"url": "http://localhost:1338/inspector/index.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug"
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
},
{
"name": "Launch Local Dev (Chrome)",
Expand All @@ -53,7 +80,10 @@
"url": "http://localhost:1338/localDev/index.html",
"webRoot": "${workspaceRoot}/",
"sourceMaps": true,
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug"
"userDataDir": "${workspaceRoot}/.tempChromeProfileForDebug",
"runtimeArgs": [
"--enable-unsafe-es3-apis"
]
}
]
}
5 changes: 3 additions & 2 deletions Babylon.csproj
Expand Up @@ -24,7 +24,7 @@
<SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider>
<TypeScriptToolsVersion>1.8</TypeScriptToolsVersion>
<TypeScriptToolsVersion>2.1</TypeScriptToolsVersion>
<UseGlobalApplicationHostFile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand Down Expand Up @@ -154,7 +154,7 @@
<TypeScriptCompile Include="src\Materials\Textures\babylon.colorGradingTexture.ts" />
<TypeScriptCompile Include="src\Materials\Textures\babylon.cubeTexture.ts" />
<TypeScriptCompile Include="src\Materials\Textures\babylon.dynamicTexture.ts" />
<TypeScriptCompile Include="src\Materials\Textures\babylon.fontTexture.ts" />
<TypeScriptCompile Include="canvas2D\src\Engine\babylon.fontTexture.ts" />
<TypeScriptCompile Include="src\Materials\Textures\babylon.mapTexture.ts" />
<TypeScriptCompile Include="src\Materials\Textures\babylon.refractionTexture.ts" />
<TypeScriptCompile Include="src\Materials\Textures\babylon.mirrorTexture.ts" />
Expand All @@ -173,6 +173,7 @@
<TypeScriptCompile Include="src\Tools\babylon.decorators.ts" />
<TypeScriptCompile Include="src\Tools\babylon.dynamicFloatArray.ts" />
<TypeScriptCompile Include="src\Tools\babylon.earcut.ts" />
<TypeScriptCompile Include="src\Tools\babylon.khronosTextureContainer.ts" />
<TypeScriptCompile Include="src\Tools\babylon.observable.ts" />
<TypeScriptCompile Include="src\Tools\babylon.rectPackingMap.ts" />
<TypeScriptCompile Include="src\Tools\babylon.stringDictionary.ts" />
Expand Down
22 changes: 18 additions & 4 deletions Exporters/3ds Max/BabylonExport.Entities/BabylonParticleSystem.cs
Expand Up @@ -11,6 +11,9 @@ public class BabylonParticleSystem
[DataMember]
public bool preventAutoStart { get; set; }

[DataMember]
public bool autoAnimate { get; set; }

[DataMember]
public string emitterId { get; set; }

Expand Down Expand Up @@ -38,17 +41,14 @@ public class BabylonParticleSystem
[DataMember]
public float[] colorDead { get; set; }

[DataMember]
public float deadAlpha { get; set; }

[DataMember]
public float emitRate { get; set; }

[DataMember]
public float updateSpeed { get; set; }

[DataMember]
public int targetStopFrame { get; set; }
public float targetStopDuration { get; set; }

[DataMember]
public float minEmitPower { get; set; }
Expand Down Expand Up @@ -88,5 +88,19 @@ public class BabylonParticleSystem

[DataMember]
public bool linkToEmitter { get; set; }

[DataMember]
public object[] animations { get; set; }

[DataMember]
public object customShader { get; set; }

public BabylonParticleSystem()
{
this.preventAutoStart = true;
this.autoAnimate = false;
this.animations = null;
this.customShader = null;
}
}
}

Large diffs are not rendered by default.

Binary file not shown.

0 comments on commit b1cb781

Please sign in to comment.