fix shader, add multiple sprite to Sprite3DEffectTest

Author: super626

tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp

@@ -397,6 +397,10 @@ Sprite3DEffectTest::Sprite3DEffectTest()
 {
     auto s = Director::getInstance()->getWinSize();
     addNewSpriteWithCoords( Vec2(s.width/2, s.height/2) );
+    
+    auto listener = EventListenerTouchAllAtOnce::create();
+    listener->onTouchesEnded = CC_CALLBACK_2(Sprite3DEffectTest::onTouchesEnded, this);
+    _eventDispatcher->addEventListenerWithSceneGraphPriority(listener, this);
 }
 
 std::string Sprite3DEffectTest::title() const
@@ -414,10 +418,11 @@ void Sprite3DEffectTest::addNewSpriteWithCoords(Vec2 p)
     auto sprite = EffectSprite3D::createFromObjFileAndTexture("Sprite3DTest/boss1.obj", "Sprite3DTest/boss.png");
     Effect3DOutline* effect = Effect3DOutline::create();
     effect->setOutlineColor(Vec3(1,0,0));
-    effect->setOutlineWidth(0.1);
+    effect->setOutlineWidth(0.001);
     sprite->addEffect(effect, -1);
     Effect3DOutline* effect2 = Effect3DOutline::create();
-    effect->setOutlineWidth(0.3);
+    effect2->setOutlineWidth(0.002);
+    effect2->setOutlineColor(Vec3(1,1,0));
     sprite->addEffect(effect2, -2);
     //sprite->setEffect3D(effect);
     sprite->setScale(6.f);
@@ -445,3 +450,13 @@ void Sprite3DEffectTest::addNewSpriteWithCoords(Vec2 p)
 
     sprite->runAction( RepeatForever::create(seq) );
 }
+
+void Sprite3DEffectTest::onTouchesEnded(const std::vector<Touch*>& touches, Event* event)
+{
+    for (auto touch: touches)
+    {
+        auto location = touch->getLocation();
+        
+        addNewSpriteWithCoords( location );
+    }
+}

tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h

@@ -125,6 +125,8 @@ class Sprite3DEffectTest : public Sprite3DTestDemo
     virtual std::string subtitle() const override;
 
     void addNewSpriteWithCoords(Vec2 p);
+    
+    void onTouchesEnded(const std::vector<Touch*>& touches, Event* event);
 };
 
 class Sprite3DTestScene : public TestScene

tests/cpp-tests/Resources/Shaders3D/OutLine.vert

@@ -4,8 +4,9 @@ uniform float OutlineWidth;
 
 void main(void)
 {
-    vec4 pos = a_position;
-    vec3 normal = a_normal;
-    pos.xyz += a_normal * OutlineWidth;
-    gl_Position = CC_MVPMatrix * pos;
+    vec4 pos = CC_MVPMatrix * a_position;
+    vec4 normalproj = CC_MVPMatrix * vec4(a_normal, 0);
+    pos.xy += normalproj.xy * (OutlineWidth * (pos.z * 0.5 + 0.5));
+    
+    gl_Position = pos;
 }