Moved sample-particles to sample-browser as ParticlesSample.cpp/,h

More changes from ParticleEmitter::TextureBlending to ParticleEmitter::BlendMode

gameplay/CMakeLists.txt

@@ -422,8 +422,8 @@ set(GAMEPLAY_LUA
     src/lua/lua_NodeType.h
     src/lua/lua_ParticleEmitter.cpp
     src/lua/lua_ParticleEmitter.h
-    src/lua/lua_ParticleEmitterTextureBlending.cpp
-    src/lua/lua_ParticleEmitterTextureBlending.h
+    src/lua/lua_ParticleEmitterBlendMode.cpp
+    src/lua/lua_ParticleEmitterBlendMode.h
     src/lua/lua_Pass.cpp
     src/lua/lua_Pass.h
     src/lua/lua_PhysicsCharacter.cpp

gameplay/android/jni/Android.mk

@@ -276,7 +276,7 @@ LOCAL_SRC_FILES := \
     lua/lua_NodeCloneContext.cpp \
     lua/lua_NodeType.cpp \
     lua/lua_ParticleEmitter.cpp \
-    lua/lua_ParticleEmitterTextureBlending.cpp \
+    lua/lua_ParticleEmitterBlendMode.cpp \
     lua/lua_Pass.cpp \
     lua/lua_PhysicsCharacter.cpp \
     lua/lua_PhysicsCollisionObject.cpp \

gameplay/gameplay.pro

@@ -234,7 +234,7 @@ SOURCES += src/AbsoluteLayout.cpp \
     src/lua/lua_NodeCloneContext.cpp \
     src/lua/lua_NodeType.cpp \
     src/lua/lua_ParticleEmitter.cpp \
-    src/lua/lua_ParticleEmitterTextureBlending.cpp \
+    src/lua/lua_ParticleEmitterBlendMode.cpp \
     src/lua/lua_Pass.cpp \
     src/lua/lua_PhysicsCharacter.cpp \
     src/lua/lua_PhysicsCollisionObject.cpp \

gameplay/gameplay.vcxproj

@@ -158,7 +158,7 @@
     <ClCompile Include="src\lua\lua_NodeCloneContext.cpp" />
     <ClCompile Include="src\lua\lua_NodeType.cpp" />
     <ClCompile Include="src\lua\lua_ParticleEmitter.cpp" />
-    <ClCompile Include="src\lua\lua_ParticleEmitterTextureBlending.cpp" />
+    <ClCompile Include="src\lua\lua_ParticleEmitterBlendMode.cpp" />
     <ClCompile Include="src\lua\lua_Pass.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsCharacter.cpp" />
     <ClCompile Include="src\lua\lua_PhysicsCollisionObject.cpp" />
@@ -448,7 +448,7 @@
     <ClInclude Include="src\lua\lua_NodeCloneContext.h" />
     <ClInclude Include="src\lua\lua_NodeType.h" />
     <ClInclude Include="src\lua\lua_ParticleEmitter.h" />
-    <ClInclude Include="src\lua\lua_ParticleEmitterTextureBlending.h" />
+    <ClInclude Include="src\lua\lua_ParticleEmitterBlendMode.h" />
     <ClInclude Include="src\lua\lua_Pass.h" />
     <ClInclude Include="src\lua\lua_PhysicsCharacter.h" />
     <ClInclude Include="src\lua\lua_PhysicsCollisionObject.h" />

samples/browser/CMakeLists.txt

@@ -27,6 +27,8 @@ set(GAME_SRC
     src/MeshBatchSample.h
     src/MeshPrimitiveSample.cpp
     src/MeshPrimitiveSample.h
+    src/ParticlesSample.cpp
+    src/ParticlesSample.h
     src/PhysicsCollisionObjectSample.cpp
     src/PhysicsCollisionObjectSample.h
     src/PostProcessSample.cpp

samples/browser/android/jni/Android.mk

@@ -100,6 +100,7 @@ LOCAL_SRC_FILES := ../../../gameplay/src/gameplay-main-android.cpp \
     LoadSceneSample.cpp \
     MeshBatchSample.cpp \
     MeshPrimitiveSample.cpp \
+	ParticlesSample.cpp \
     PhysicsCollisionObjectSample.cpp \
     PostProcessSample.cpp \
     SpriteBatchSample.cpp \

samples/browser/sample-browser.pro

@@ -22,6 +22,7 @@ SOURCES += src/Audio3DSample.cpp \
     src/LoadSceneSample.cpp \
     src/MeshBatchSample.cpp \
     src/MeshPrimitiveSample.cpp \
+	src/ParticlesSample.cpp \
     src/PhysicsCollisionObjectSample.cpp \
     src/PostProcessSample.cpp \
     src/SpriteBatchSample.cpp \
@@ -46,6 +47,7 @@ HEADERS += src/Audio3DSample.h \
     src/LoadSceneSample.h \
     src/MeshBatchSample.h \
     src/MeshPrimitiveSample.h \
+	src/ParticlesSample.h \
     src/PhysicsCollisionObjectSample.h \
     src/PostProcessSample.h \
     src/SpriteBatchSample.h \

samples/browser/sample-browser.vcxproj

@@ -204,6 +204,12 @@ copy ..\..\gameplay\res\logo_powered_white.png res</Command>
     <None Include="res\common\light.form" />
     <None Include="res\common\light.material" />
     <None Include="res\common\lightBrickWall.gpb" />
+    <None Include="res\common\particles\editor.form" />
+    <None Include="res\common\particles\editor.theme" />
+    <None Include="res\common\particles\explosion.particle" />
+    <None Include="res\common\particles\fire.particle" />
+    <None Include="res\common\particles\grid.material" />
+    <None Include="res\common\particles\smoke.particle" />
     <None Include="res\common\physics.form" />
     <None Include="res\common\physics.gpb" />
     <None Include="res\common\physics.material" />
@@ -233,6 +239,11 @@ copy ..\..\gameplay\res\logo_powered_white.png res</Command>
     <None Include="res\common\terrain\terrain.form" />
     <None Include="res\common\terrain\terrain.material" />
     <None Include="res\common\text.form" />
+    <None Include="res\common\water\pond.gpb" />
+    <None Include="res\common\water\watersample.frag" />
+    <None Include="res\common\water\watersample.material" />
+    <None Include="res\common\water\watersample.scene" />
+    <None Include="res\common\water\watersample.vert" />
     <None Include="res\shaders\colored.frag" />
     <None Include="res\shaders\colored.vert" />
     <None Include="res\shaders\font.frag" />
@@ -258,6 +269,7 @@ copy ..\..\gameplay\res\logo_powered_white.png res</Command>
     <ClCompile Include="src\GamepadSample.cpp" />
     <ClCompile Include="src\GestureSample.cpp" />
     <ClCompile Include="src\LightSample.cpp" />
+    <ClCompile Include="src\ParticlesSample.cpp" />
     <ClCompile Include="src\PostProcessSample.cpp" />
     <ClCompile Include="src\TerrainSample.cpp" />
     <ClCompile Include="src\TriangleSample.cpp" />
@@ -283,6 +295,7 @@ copy ..\..\gameplay\res\logo_powered_white.png res</Command>
     <ClInclude Include="src\GamepadSample.h" />
     <ClInclude Include="src\GestureSample.h" />
     <ClInclude Include="src\LightSample.h" />
+    <ClInclude Include="src\ParticlesSample.h" />
     <ClInclude Include="src\PostProcessSample.h" />
     <ClInclude Include="src\TerrainSample.h" />
     <ClInclude Include="src\TriangleSample.h" />
@@ -301,11 +314,17 @@ copy ..\..\gameplay\res\logo_powered_white.png res</Command>
     <ClInclude Include="src\WaterSample.h" />
   </ItemGroup>
   <ItemGroup>
+    <Image Include="res\common\particles\editor.png" />
+    <Image Include="res\common\particles\explosion.png" />
+    <Image Include="res\common\particles\fire.png" />
+    <Image Include="res\common\particles\smoke.png" />
     <Image Include="res\common\terrain\dirt.dds" />
     <Image Include="res\common\terrain\grass.dds" />
     <Image Include="res\common\terrain\normalmap.dds" />
     <Image Include="res\common\terrain\rock.dds" />
     <Image Include="res\common\terrain\sky.dds" />
+    <Image Include="res\common\water\water_normal.png" />
+    <Image Include="res\common\water\water_sample.png" />
     <Image Include="res\logo_powered_white.png" />
     <Image Include="res\png\brick.png" />
     <Image Include="res\png\brickn.png" />

samples/browser/src/ParticlesSample.cpp

@@ -883,13 +883,13 @@ bool ParticlesSample::mouseEvent(Mouse::MouseEvent evt, int x, int y, int wheelD
             Vector3 n(-(float)x * PANNING_SENSITIVITY, (float)y * PANNING_SENSITIVITY, 0);
             _cameraParent->getMatrix().transformVector(&n);
             _cameraParent->translate(n);
-            return false;
+            return true;
         }
         else if (_rotating)
         {
             _cameraParent->rotateY(-MATH_DEG_TO_RAD((float)x * ROTATE_SENSITIVITY));
             _cameraParent->rotateX(-MATH_DEG_TO_RAD((float)y * ROTATE_SENSITIVITY));
-            return false;
+            return true;
         }
         else if (_zooming)
         {
@@ -897,7 +897,7 @@ bool ParticlesSample::mouseEvent(Mouse::MouseEvent evt, int x, int y, int wheelD
             v.normalize();
             v.scale((float)(x-y) * INPUT_SENSITIVITY);
             _scene->getActiveCamera()->getNode()->translate(v);
-            return false;
+            return true;
         }
         break;
 
@@ -908,12 +908,12 @@ bool ParticlesSample::mouseEvent(Mouse::MouseEvent evt, int x, int y, int wheelD
             v.normalize();
             v.scale((float)(wheelDelta));
             _scene->getActiveCamera()->getNode()->translate(v);
-            return false;
+            return true;
         }
         break;
     }
 
-    return false;
+    return true;
 }
 
 void ParticlesSample::touchEvent(Touch::TouchEvent evt, int x, int y, unsigned int contactIndex)