mirror of https://github.com/axmolengine/axmol.git
remove DrawPrimitivesTests (Cocos2Dx) (redundant mit DrawNodeTest) (#2179)
* remove DrawPrimitivesTests (Cocos2Dx) * Update CMakeLists.txt
This commit is contained in:
aismann
GitHub
parent
dfab7a32d3
commit
bf4ef2ff83
|
|
@ -190,7 +190,6 @@ list(APPEND GAME_HEADER
|
|||
Source/MeshRendererTest/MeshRendererTest.h
|
||||
Source/MeshRendererTest/DrawNode3D.h
|
||||
Source/DrawNodeTest/DrawNodeTest.h
|
||||
Source/DrawPrimitivesTest/DrawPrimitivesTest.h
|
||||
Source/BaseTest.h
|
||||
Source/SceneTest/SceneTest.h
|
||||
Source/ReleasePoolTest/ReleasePoolTest.h
|
||||
|
|
@ -324,7 +323,6 @@ list(APPEND GAME_SOURCE
|
|||
# Source/Scene3DTest/Scene3DTest.cpp
|
||||
Source/MeshRendererTest/DrawNode3D.cpp
|
||||
Source/DrawNodeTest/DrawNodeTest.cpp
|
||||
Source/DrawPrimitivesTest/DrawPrimitivesTest.cpp
|
||||
Source/MeshRendererTest/MeshRendererTest.cpp
|
||||
Source/SpritePolygonTest/SpritePolygonTest.cpp
|
||||
Source/SpriteTest/SpriteTest.cpp
|
||||
|
|
|
|||
|
|
@ -1,656 +0,0 @@
|
|||
/****************************************************************************
|
||||
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
||||
|
||||
https://axmol.dev/
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "DrawPrimitivesTest.h"
|
||||
#include "renderer/Renderer.h"
|
||||
#include "renderer/CustomCommand.h"
|
||||
|
||||
using namespace ax;
|
||||
|
||||
using namespace std;
|
||||
|
||||
DrawPrimitivesTests::DrawPrimitivesTests()
|
||||
{
|
||||
ADD_TEST_CASE(DrawNodeTest);
|
||||
ADD_TEST_CASE(DrawNodeBackwardsAPITest);
|
||||
ADD_TEST_CASE(BetterCircleRendering);
|
||||
ADD_TEST_CASE(DrawNodeTestNewFeature1);
|
||||
ADD_TEST_CASE(Issue829Test);
|
||||
ADD_TEST_CASE(Issue1319Test);
|
||||
}
|
||||
|
||||
string DrawPrimitivesBaseTest::title() const
|
||||
{
|
||||
return "No title";
|
||||
}
|
||||
|
||||
// DrawNodeTest
|
||||
DrawNodeTest::DrawNodeTest()
|
||||
{
|
||||
auto s = Director::getInstance()->getWinSize();
|
||||
|
||||
auto draw = DrawNode::create();
|
||||
addChild(draw, 10);
|
||||
|
||||
draw->drawPoint(Vec2(s.width / 2 - 120, s.height / 2 - 120), 10,
|
||||
Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 1));
|
||||
|
||||
draw->drawPoint(Vec2(s.width / 2 + 120, s.height / 2 + 120), 10,
|
||||
Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 1));
|
||||
|
||||
// draw 4 small points
|
||||
Vec2 position[] = {Vec2(60, 60), Vec2(70, 70), Vec2(60, 70), Vec2(70, 60)};
|
||||
draw->drawPoints(position, 4, 5, Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 1));
|
||||
|
||||
// draw a line
|
||||
draw->drawLine(Vec2(0, 0), Vec2(s.width, s.height), Color4F(1.0, 0.0, 0.0, 0.5));
|
||||
|
||||
// draw a rectangle
|
||||
draw->drawRect(Vec2(23, 23), Vec2(7, 7), Color4F(1, 1, 0, 1));
|
||||
|
||||
draw->drawRect(Vec2(15, 30), Vec2(30, 15), Vec2(15, 0), Vec2(0, 15),
|
||||
Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 1));
|
||||
|
||||
// draw a circle
|
||||
draw->drawCircle(VisibleRect::center() + Vec2(140, 0), 100, AX_DEGREES_TO_RADIANS(90), 50, true, 1.0f, 2.0f,
|
||||
Color4F(1.0f, 0.0f, 0.0f, 0.5f));
|
||||
|
||||
draw->drawCircle(VisibleRect::center() - Vec2(140, 0), 50, AX_DEGREES_TO_RADIANS(90), 30, false,
|
||||
Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 1.0f));
|
||||
|
||||
// Draw some beziers
|
||||
draw->drawQuadBezier(Vec2(s.width - 150, s.height - 150), Vec2(s.width - 70, s.height - 10),
|
||||
Vec2(s.width - 10, s.height - 10), 10,
|
||||
Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 0.5f));
|
||||
|
||||
draw->drawQuadBezier(Vec2(0.0f, s.height), Vec2(s.width / 2, s.height / 2), Vec2(s.width, s.height), 50,
|
||||
Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 0.5f));
|
||||
|
||||
draw->drawCubicBezier(VisibleRect::center(), Vec2(VisibleRect::center().x + 30, VisibleRect::center().y + 50),
|
||||
Vec2(VisibleRect::center().x + 60, VisibleRect::center().y - 50), VisibleRect::right(), 100,
|
||||
Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 0.5f));
|
||||
|
||||
draw->drawCubicBezier(Vec2(s.width - 250, 40.0f), Vec2(s.width - 70, 100.0f), Vec2(s.width - 30, 250.0f),
|
||||
Vec2(s.width - 10, s.height - 50), 10,
|
||||
Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 0.5f));
|
||||
|
||||
auto array = PointArray::create(20);
|
||||
array->addControlPoint(Vec2(0.0f, 0.0f));
|
||||
array->addControlPoint(Vec2(80.0f, 80.0f));
|
||||
array->addControlPoint(Vec2(s.width - 80, 80.0f));
|
||||
array->addControlPoint(Vec2(s.width - 80, s.height - 80));
|
||||
array->addControlPoint(Vec2(80.0f, s.height - 80));
|
||||
array->addControlPoint(Vec2(80.0f, 80.0f));
|
||||
array->addControlPoint(Vec2(s.width / 2, s.height / 2));
|
||||
draw->drawCardinalSpline(array, 0.5f, 50, Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 0.5f));
|
||||
|
||||
auto array2 = PointArray::create(20);
|
||||
array2->addControlPoint(Vec2(s.width / 2, 30.0f));
|
||||
array2->addControlPoint(Vec2(s.width - 80, 30.0f));
|
||||
array2->addControlPoint(Vec2(s.width - 80, s.height - 80));
|
||||
array2->addControlPoint(Vec2(s.width / 2, s.height - 80));
|
||||
array2->addControlPoint(Vec2(s.width / 2, 30.0f));
|
||||
draw->drawCatmullRom(array2, 50, Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 0.5f));
|
||||
|
||||
// open random color poly
|
||||
Vec2 vertices[] = {Vec2(0.0f, 0.0f), Vec2(50.0f, 50.0f), Vec2(100.0f, 50.0f), Vec2(100.0f, 100.0f),
|
||||
Vec2(50.0f, 100.0f)};
|
||||
draw->drawPoly(vertices, 5, false, Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 1.0f));
|
||||
|
||||
// closed random color poly
|
||||
Vec2 vertices2[] = {Vec2(30.0f, 130.0f), Vec2(30.0f, 230.0f), Vec2(50.0f, 200.0f)};
|
||||
draw->drawPoly(vertices2, 3, true, Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 1.0f));
|
||||
|
||||
// Draw 10 circles
|
||||
for (int i = 0; i < 10; i++)
|
||||
{
|
||||
draw->drawDot(Vec2(s.width / 2, s.height / 2), 10.f * (10 - i),
|
||||
Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 1.0f));
|
||||
}
|
||||
|
||||
// Draw polygons
|
||||
Vec2 points[] = {Vec2(s.height / 4, 0.0f), Vec2(s.width, s.height / 5), Vec2(s.width / 3 * 2, s.height)};
|
||||
draw->drawPolygon(points, sizeof(points) / sizeof(points[0]), Color4F(1.0f, 0.0f, 0.0f, 0.5f), 4,
|
||||
Color4F(0.0f, 0.0f, 1.0f, 0.5f));
|
||||
|
||||
// star poly (triggers buggs)
|
||||
{
|
||||
const float o = 80;
|
||||
const float w = 20;
|
||||
const float h = 50;
|
||||
Vec2 star[] = {
|
||||
Vec2(o + w, o - h), Vec2(o + w * 2, o), // lower spike
|
||||
Vec2(o + w * 2 + h, o + w), Vec2(o + w * 2, o + w * 2), // right spike
|
||||
// {o +w, o+w*2+h}, {o,o+w*2}, // top spike
|
||||
// {o -h, o+w}, {o,o}, // left spike
|
||||
};
|
||||
|
||||
draw->drawPolygon(star, sizeof(star) / sizeof(star[0]), Color4F(1.0f, 0.0f, 0.0f, 0.5f), 1,
|
||||
Color4F(0.0f, 0.0f, 1.0f, 1.0f));
|
||||
}
|
||||
|
||||
// star poly (doesn't trigger bug... order is important un tesselation is supported.
|
||||
{
|
||||
const float o = 180;
|
||||
const float w = 20;
|
||||
const float h = 50;
|
||||
Vec2 star[] = {
|
||||
Vec2(o, o),
|
||||
Vec2(o + w, o - h),
|
||||
Vec2(o + w * 2, o), // lower spike
|
||||
Vec2(o + w * 2 + h, o + w),
|
||||
Vec2(o + w * 2, o + w * 2), // right spike
|
||||
Vec2(o + w, o + w * 2 + h),
|
||||
Vec2(o, o + w * 2), // top spike
|
||||
Vec2(o - h, o + w), // left spike
|
||||
};
|
||||
|
||||
draw->drawPolygon(star, sizeof(star) / sizeof(star[0]), Color4F(1.0f, 0.0f, 0.0f, 0.5f), 1,
|
||||
Color4F(0.0f, 0.0f, 1.0f, 1.0f));
|
||||
}
|
||||
|
||||
// draw a solid polygon
|
||||
Vec2 vertices3[] = {Vec2(60.0f, 160.0f), Vec2(70.0f, 190.0f), Vec2(100.0f, 190.0f), Vec2(90.0f, 160.0f)};
|
||||
draw->drawSolidPoly(vertices3, 4, Color4F(1.0f, 1.0f, 0.0f, 1.0f));
|
||||
|
||||
// draw a solid rectangle
|
||||
draw->drawSolidRect(Vec2(10.0f, 10.0f), Vec2(20.0f, 20.0f), Color4F(1.0f, 1.0f, 0.0f, 1.0f));
|
||||
|
||||
// draw a solid circle
|
||||
draw->drawSolidCircle(VisibleRect::center() + Vec2(140.0f, 0.0f), 40, AX_DEGREES_TO_RADIANS(90), 50, 2.0f, 2.0f,
|
||||
Color4F(0.0f, 1.0f, 0.0f, 1.0f));
|
||||
|
||||
// Draw segment
|
||||
draw->drawSegment(Vec2(20.0f, s.height), Vec2(20.0f, s.height / 2), 10, Color4F(0.0f, 1.0f, 0.0f, 1.0f));
|
||||
|
||||
draw->drawSegment(Vec2(10.0f, s.height / 2), Vec2(s.width / 2, s.height / 2), 40, Color4F(1.0f, 0.0f, 1.0f, 0.5f));
|
||||
|
||||
// Draw triangle
|
||||
draw->drawTriangle(Vec2(10.0f, 10.0f), Vec2(70.0f, 30.0f), Vec2(100.0f, 140.0f),
|
||||
Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 0.5f));
|
||||
|
||||
for (int i = 0; i < 100; i++)
|
||||
{
|
||||
draw->drawPoint(Vec2(i * 7.0f, 5.0f), (float)i / 5 + 1,
|
||||
Color4F(AXRANDOM_0_1(), AXRANDOM_0_1(), AXRANDOM_0_1(), 1.0f));
|
||||
}
|
||||
|
||||
auto draw1 = DrawNode::create();
|
||||
this->addChild(draw1, 10);
|
||||
draw1->drawLine(Vec2(0.0f, s.height), Vec2(s.width, s.height - 20), Color4F::YELLOW);
|
||||
draw1->drawLine(Vec2(0.0f, 0.0f), Vec2(s.width, s.height - 20), Color4F::YELLOW);
|
||||
|
||||
draw->runAction(RepeatForever::create(Sequence::create(FadeIn::create(1.2f), FadeOut::create(1.2f), NULL)));
|
||||
draw1->runAction(RepeatForever::create(Sequence::create(FadeIn::create(1.2f), FadeOut::create(1.2f), NULL)));
|
||||
}
|
||||
|
||||
string DrawNodeTest::title() const
|
||||
{
|
||||
return "Test DrawNode";
|
||||
}
|
||||
|
||||
string DrawNodeTest::subtitle() const
|
||||
{
|
||||
return "Testing DrawNode - batched draws. Concave polygons working too!";
|
||||
}
|
||||
|
||||
//
|
||||
// Issue11942Test
|
||||
//
|
||||
DrawNodeBackwardsAPITest::DrawNodeBackwardsAPITest()
|
||||
{
|
||||
float o = 80;
|
||||
float w = 20;
|
||||
float h = 50;
|
||||
|
||||
auto drawNode1 = DrawNode::create();
|
||||
addChild(drawNode1);
|
||||
drawNode1->setPosition(-40, 20);
|
||||
|
||||
int x = 0;
|
||||
int y = 0;
|
||||
Vec2 vertices[4];
|
||||
drawNode1->setScale(0.5);
|
||||
Color4F color;
|
||||
bool setIsConvex = false;
|
||||
for (int iy = 0; iy < 5; iy++)
|
||||
{
|
||||
x = 0;
|
||||
for (int ix = 0; ix < 13; ix++)
|
||||
{
|
||||
vertices[0] = Vec2(x + o + w, y + o - h);
|
||||
vertices[1] = Vec2(x + o + w * 2, y + o);
|
||||
vertices[2] = Vec2(x + o + w * 2 + h, y + o + w);
|
||||
vertices[3] = Vec2(x + o + w * 2, y + o + w * 2);
|
||||
|
||||
if (AXRANDOM_0_1() > 0.5f)
|
||||
{
|
||||
drawNode1->setIsConvex(true);
|
||||
setIsConvex = true;
|
||||
color = Color4F::YELLOW;
|
||||
}
|
||||
else
|
||||
{
|
||||
drawNode1->setIsConvex(false); // default value!
|
||||
setIsConvex = false;
|
||||
color = Color4F::ORANGE;
|
||||
}
|
||||
drawNode1->drawPolygon(vertices, 4, Color4F(0.7f, 0.7f, 0.7f, 0.5f), 1, color, setIsConvex);
|
||||
x += 70;
|
||||
}
|
||||
y += 80;
|
||||
}
|
||||
}
|
||||
|
||||
string DrawNodeBackwardsAPITest::title() const
|
||||
{
|
||||
return "API backwards compatible test";
|
||||
}
|
||||
|
||||
string DrawNodeBackwardsAPITest::subtitle() const
|
||||
{
|
||||
return "YELLOW=cocos2dx/axmol <=2.0 ORANGE=axmol >2.0";
|
||||
}
|
||||
|
||||
//
|
||||
// drawCircle new feature (better rendering)
|
||||
//
|
||||
BetterCircleRendering::BetterCircleRendering()
|
||||
{
|
||||
// Add lines to see the correct "scale of the 'rings'" changing the window size
|
||||
|
||||
auto draw = DrawNode::create();
|
||||
|
||||
addChild(draw, 10);
|
||||
|
||||
for (float y = 0; y < VisibleRect::top().y; y += 10)
|
||||
{
|
||||
draw->drawLine({VisibleRect::left().x, y}, {VisibleRect::right().x, y}, Color4B::GRAY);
|
||||
}
|
||||
initSliders();
|
||||
|
||||
drawNode = DrawNode::create();
|
||||
addChild(drawNode, 10);
|
||||
|
||||
|
||||
|
||||
scheduleUpdate();
|
||||
}
|
||||
|
||||
void BetterCircleRendering::changeLineWidth(ax::Object* pSender, ax::ui::Slider::EventType type)
|
||||
{
|
||||
if (type == ax::ui::Slider::EventType::ON_PERCENTAGE_CHANGED)
|
||||
{
|
||||
ax::ui::Slider* sliderLineWidth = dynamic_cast<ax::ui::Slider*>(pSender);
|
||||
lineWidth = static_cast<float>(sliderLineWidth->getPercent());
|
||||
_lineWidthLabel->setString("setLineWidth(" + Value(lineWidth).asString() + ")");
|
||||
}
|
||||
}
|
||||
|
||||
void BetterCircleRendering::changeThreshold(ax::Object* pSender, ax::ui::Slider::EventType type)
|
||||
{
|
||||
if (type == ax::ui::Slider::EventType::ON_PERCENTAGE_CHANGED)
|
||||
{
|
||||
ax::ui::Slider* sliderThreshold = dynamic_cast<ax::ui::Slider*>(pSender);
|
||||
threshold = static_cast<float>(sliderThreshold->getPercent());
|
||||
_thresholdLabel->setString("drawCircle(pos, radius, ..., segments, ..., color, " + Value(threshold).asString() +
|
||||
")");
|
||||
}
|
||||
}
|
||||
|
||||
void BetterCircleRendering::initSliders()
|
||||
{
|
||||
auto vsize = Director::getInstance()->getVisibleSize();
|
||||
ax::ui::Slider* slider = ax::ui::Slider::create();
|
||||
slider->setPercent(0);
|
||||
slider->loadBarTexture("cocosui/sliderTrack.png");
|
||||
slider->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
|
||||
slider->loadProgressBarTexture("cocosui/sliderProgress.png");
|
||||
slider->setPosition(Vec2(vsize.width / 2, vsize.height / 6));
|
||||
|
||||
slider->addEventListener(AX_CALLBACK_2(BetterCircleRendering::changeThreshold, this));
|
||||
|
||||
auto ttfConfig = TTFConfig("fonts/arial.ttf", 8);
|
||||
_thresholdLabel = Label::createWithTTF(ttfConfig, "drawCircle(pos, radius, ..., segments, ..., color, 0)");
|
||||
addChild(_thresholdLabel, 20);
|
||||
_thresholdLabel->setPosition(Vec2(vsize.width / 2, vsize.height / 6 + 15));
|
||||
|
||||
addChild(slider, 20);
|
||||
|
||||
ax::ui::Slider* sliderLineWidth = ax::ui::Slider::create();
|
||||
sliderLineWidth->setPercent(0);
|
||||
sliderLineWidth->loadBarTexture("cocosui/sliderTrack.png");
|
||||
sliderLineWidth->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
|
||||
sliderLineWidth->loadProgressBarTexture("cocosui/sliderProgress.png");
|
||||
sliderLineWidth->setPosition(Vec2(vsize.width / 2, vsize.height / 6 + 35));
|
||||
sliderLineWidth->addEventListener(AX_CALLBACK_2(BetterCircleRendering::changeLineWidth, this));
|
||||
|
||||
_lineWidthLabel = Label::createWithTTF(ttfConfig, "setLineWidth(0)");
|
||||
|
||||
addChild(_lineWidthLabel, 20);
|
||||
_lineWidthLabel->setPosition(Vec2(vsize.width / 2, vsize.height / 6 + 50));
|
||||
addChild(sliderLineWidth, 20);
|
||||
}
|
||||
|
||||
void BetterCircleRendering::update(float dt)
|
||||
{
|
||||
drawNode->clear();
|
||||
|
||||
|
||||
// Old behavior => faster but badly rendering if line width > 5 (= rings)
|
||||
drawNode->drawCircle(VisibleRect::center() + Vec2(120.0f, 0.0f), 60, AX_DEGREES_TO_RADIANS(90), 36, false,
|
||||
Color4F::RED);
|
||||
|
||||
// New behavior => slower but good rendering if line width > 5
|
||||
auto color = Color4F::GREEN;
|
||||
if (lineWidth <= threshold)
|
||||
{
|
||||
color = Color4F::RED; // using the faster rendering internal method of drawCircle (old behavior)
|
||||
}
|
||||
drawNode->drawCircle(VisibleRect::center() - Vec2(120.0f, 0.0f), 60, AX_DEGREES_TO_RADIANS(90), 36, false, color,
|
||||
threshold);
|
||||
}
|
||||
|
||||
string BetterCircleRendering::title() const
|
||||
{
|
||||
return "Rendering drawCircle";
|
||||
}
|
||||
|
||||
string BetterCircleRendering::subtitle() const
|
||||
{
|
||||
return "Green: smoother rendering; Red: faster but badly rendering";
|
||||
}
|
||||
|
||||
DrawNodeTestNewFeature1::DrawNodeTestNewFeature1()
|
||||
{
|
||||
drawNode = DrawNode::create();
|
||||
addChild(drawNode, 10);
|
||||
|
||||
initSliders();
|
||||
|
||||
scheduleUpdate();
|
||||
}
|
||||
|
||||
void DrawNodeTestNewFeature1::changeEndAngle(ax::Object* pSender, ax::ui::Slider::EventType type)
|
||||
{
|
||||
if (type == ax::ui::Slider::EventType::ON_PERCENTAGE_CHANGED)
|
||||
{
|
||||
ax::ui::Slider* sEndAngle = dynamic_cast<ax::ui::Slider*>(pSender);
|
||||
endAngle = sEndAngle->getPercent() * 3.6;
|
||||
_EndAngleLabel->setString("endAngle: (" + Value(endAngle).asString() + ")");
|
||||
}
|
||||
}
|
||||
|
||||
void DrawNodeTestNewFeature1::changeStartAngle(ax::Object* pSender, ax::ui::Slider::EventType type)
|
||||
{
|
||||
if (type == ax::ui::Slider::EventType::ON_PERCENTAGE_CHANGED)
|
||||
{
|
||||
ax::ui::Slider* sStartAngle = dynamic_cast<ax::ui::Slider*>(pSender);
|
||||
startAngle = sStartAngle->getPercent() * 3.6;
|
||||
_StartAngleLabel->setString("startAngle: (" + Value(startAngle).asString() + ")");
|
||||
}
|
||||
}
|
||||
|
||||
void DrawNodeTestNewFeature1::changeAngle(ax::Object* pSender, ax::ui::Slider::EventType type)
|
||||
{
|
||||
if (type == ax::ui::Slider::EventType::ON_PERCENTAGE_CHANGED)
|
||||
{
|
||||
ax::ui::Slider* sStartAngle = dynamic_cast<ax::ui::Slider*>(pSender);
|
||||
angle = sStartAngle->getPercent() * 3.6;
|
||||
_AngleLabel->setString("Angle: (" + Value(angle).asString() + ")");
|
||||
}
|
||||
}
|
||||
|
||||
void DrawNodeTestNewFeature1::initSliders()
|
||||
{
|
||||
angle = 324;
|
||||
endAngle = 360;
|
||||
startAngle = 0;
|
||||
|
||||
auto vsize = Director::getInstance()->getVisibleSize();
|
||||
ax::ui::Slider* sliderStartAngle = ax::ui::Slider::create();
|
||||
sliderStartAngle->setPercent(startAngle);
|
||||
sliderStartAngle->loadBarTexture("cocosui/sliderTrack.png");
|
||||
sliderStartAngle->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
|
||||
sliderStartAngle->loadProgressBarTexture("cocosui/sliderProgress.png");
|
||||
sliderStartAngle->setPosition(Vec2(vsize.width / 2, vsize.height / 6));
|
||||
|
||||
sliderStartAngle->addEventListener(AX_CALLBACK_2(DrawNodeTestNewFeature1::changeStartAngle, this));
|
||||
|
||||
auto ttfConfig = TTFConfig("fonts/arial.ttf", 8);
|
||||
_StartAngleLabel = Label::createWithTTF(ttfConfig, "StartAngle");
|
||||
addChild(_StartAngleLabel, 20);
|
||||
_StartAngleLabel->setPosition(Vec2(vsize.width / 2, vsize.height / 6 + 15));
|
||||
|
||||
addChild(sliderStartAngle, 20);
|
||||
|
||||
ax::ui::Slider* sliderEndAngle = ax::ui::Slider::create();
|
||||
sliderEndAngle->setPercent(endAngle);
|
||||
sliderEndAngle->loadBarTexture("cocosui/sliderTrack.png");
|
||||
sliderEndAngle->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
|
||||
sliderEndAngle->loadProgressBarTexture("cocosui/sliderProgress.png");
|
||||
sliderEndAngle->setPosition(Vec2(vsize.width / 2, vsize.height / 6 + 35));
|
||||
sliderEndAngle->addEventListener(AX_CALLBACK_2(DrawNodeTestNewFeature1::changeEndAngle, this));
|
||||
|
||||
_EndAngleLabel = Label::createWithTTF(ttfConfig, "endAngle");
|
||||
|
||||
addChild(_EndAngleLabel, 20);
|
||||
_EndAngleLabel->setPosition(Vec2(vsize.width / 2, vsize.height / 6 + 50));
|
||||
addChild(sliderEndAngle, 20);
|
||||
|
||||
ax::ui::Slider* sliderAngle = ax::ui::Slider::create();
|
||||
sliderAngle->setPercent(angle);
|
||||
sliderAngle->loadBarTexture("cocosui/sliderTrack.png");
|
||||
sliderAngle->loadSlidBallTextures("cocosui/sliderThumb.png", "cocosui/sliderThumb.png", "");
|
||||
sliderAngle->loadProgressBarTexture("cocosui/sliderProgress.png");
|
||||
sliderAngle->setPosition(Vec2(vsize.width / 2, vsize.height / 6 + 65));
|
||||
sliderAngle->addEventListener(AX_CALLBACK_2(DrawNodeTestNewFeature1::changeAngle, this));
|
||||
|
||||
_AngleLabel = Label::createWithTTF(ttfConfig, "Angle");
|
||||
|
||||
addChild(_AngleLabel, 20);
|
||||
_AngleLabel->setPosition(Vec2(vsize.width / 2, vsize.height / 6 + 80));
|
||||
addChild(sliderAngle, 20);
|
||||
}
|
||||
|
||||
void DrawNodeTestNewFeature1::update(float dt)
|
||||
{
|
||||
drawNode->clear();
|
||||
|
||||
// Pie
|
||||
drawNode->drawPie(VisibleRect::center() - Vec2(170.0f, -35.0f), 50, angle, startAngle, endAngle, 1.0f, 1.0f,
|
||||
Color4F::BLUE, drawNode->DrawMode::Fill);
|
||||
drawNode->drawPie(VisibleRect::center() - Vec2(60.0f, -35.0f), 50, angle, startAngle, endAngle, 1.0f, 1.0f,
|
||||
Color4F::BLUE, drawNode->DrawMode::Outline);
|
||||
drawNode->drawPie(VisibleRect::center() + Vec2(60.0f, 35.0f), 50, angle, startAngle, endAngle, 1.0f, 1.0f,
|
||||
Color4F::BLUE, drawNode->DrawMode::Line);
|
||||
drawNode->drawPie(VisibleRect::center() + Vec2(170.0f, 35.0f), 50, angle, startAngle, endAngle, 1.0f, 1.0f,
|
||||
Color4F::BLUE, drawNode->DrawMode::Semi);
|
||||
}
|
||||
|
||||
string DrawNodeTestNewFeature1::title() const
|
||||
{
|
||||
return "DrawNode::drawPie";
|
||||
}
|
||||
|
||||
string DrawNodeTestNewFeature1::subtitle() const
|
||||
{
|
||||
return "Filled, Outlined, Line, Semi";
|
||||
}
|
||||
|
||||
Issue829Test::Issue829Test()
|
||||
{
|
||||
Vec2 vertices0[] = {{50.0, 20.0}, {100.0, 0.0}, {80.0, 50.0}, {100.0, 100.0},
|
||||
{50.0, 80.0}, {0.0, 100.0}, {20.0, 50.0}, {0, 0}};
|
||||
|
||||
Vec2 vertices4[] = {{362, 148}, {326, 241}, {295, 219}, {258, 88}, {440, 129},
|
||||
{370, 196}, {372, 275}, {348, 257}, {364, 148}};
|
||||
|
||||
Vec2* ver[] = {vertices0, vertices4};
|
||||
|
||||
DrawNode* drawNode[sizeof(ver) + 1];
|
||||
for (int i = 0; i < sizeof(ver); i++)
|
||||
{
|
||||
drawNode[i] = DrawNode::create();
|
||||
addChild(drawNode[i]);
|
||||
}
|
||||
|
||||
drawNode[0]->drawPolygon(vertices0, sizeof(vertices0) / sizeof(vertices0[0]), Color4F(0.0f, 0.0f, 0.7f, 0.5f), 3,
|
||||
Color4F(0.0f, 0.0f, 1.0f, 1.0f));
|
||||
drawNode[0]->setPosition({20, 200});
|
||||
drawDirection(vertices0, sizeof(vertices0) / sizeof(vertices0[0]), drawNode[0]->getPosition());
|
||||
|
||||
drawNode[4]->drawPolygon(vertices4, sizeof(vertices4) / sizeof(vertices4[0]), Color4F(0.0f, 0.0f, 0.7f, 0.5f), 3,
|
||||
Color4F(0.0f, 0.0f, 1.0f, 1.0f));
|
||||
drawNode[4]->setPosition({-70, -20});
|
||||
drawDirection(vertices4, sizeof(vertices4) / sizeof(vertices4[0]), drawNode[4]->getPosition());
|
||||
|
||||
{
|
||||
const float o = 80;
|
||||
const float w = 20;
|
||||
const float h = 50;
|
||||
{ // star
|
||||
auto drawNode1 = DrawNode::create();
|
||||
addChild(drawNode1);
|
||||
drawNode1->setPosition(300, 100);
|
||||
Vec2 star[] = {
|
||||
Vec2(o, o),
|
||||
Vec2(o + w, o - h),
|
||||
Vec2(o + w * 2, o), // lower spike
|
||||
Vec2(o + w * 2 + h, o + w),
|
||||
Vec2(o + w * 2, o + w * 2), // right spike
|
||||
Vec2(o + w, o + w * 2 + h),
|
||||
Vec2(o, o + w * 2), // top spike
|
||||
Vec2(o - h, o + w), // left spike
|
||||
};
|
||||
|
||||
drawNode1->drawPolygon(star, sizeof(star) / sizeof(star[0]), Color4F(0.0f, 0.0f, 0.7f, 0.5f), 1,
|
||||
Color4F(0.0f, 0.0f, 1.0f, 1.0f));
|
||||
|
||||
drawDirection(star, sizeof(star) / sizeof(star[0]), drawNode1->getPosition());
|
||||
}
|
||||
|
||||
{ // wrong order
|
||||
auto drawNode1 = DrawNode::create();
|
||||
addChild(drawNode1);
|
||||
drawNode1->setPosition(-80, 20);
|
||||
Vec2 wrongOrder[] = {Vec2(o + w, o - h), Vec2(o + w * 2, o), Vec2(o + w * 2 + h, o + w),
|
||||
Vec2(o + w * 2, o + w * 2)};
|
||||
|
||||
drawNode1->drawPolygon(wrongOrder, sizeof(wrongOrder) / sizeof(wrongOrder[0]),
|
||||
Color4F(0.0f, 0.0f, 0.7f, 0.5f), 1, Color4F(1.0f, 0.0f, 0.0f, 1.0f));
|
||||
|
||||
drawDirection(wrongOrder, sizeof(wrongOrder) / sizeof(wrongOrder[0]), drawNode1->getPosition());
|
||||
}
|
||||
{ // correct order
|
||||
Vec2 correctOrder[] = {Vec2(o + w * 2, o), Vec2(o + w * 2 + h, o + w), Vec2(o + w * 2, o + w * 2),
|
||||
Vec2(o + w, o - h)};
|
||||
auto drawNode2 = DrawNode::create();
|
||||
addChild(drawNode2);
|
||||
drawNode2->setPosition({-10, 20});
|
||||
drawNode2->drawPolygon(correctOrder, sizeof(correctOrder) / sizeof(correctOrder[0]),
|
||||
Color4F(0.0f, 0.0f, 0.7f, 0.5f), 1, Color4F(0.0f, 1.0f, 0.0f, 1.0f));
|
||||
|
||||
drawDirection(correctOrder, sizeof(correctOrder) / sizeof(correctOrder[0]), drawNode2->getPosition());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void Issue829Test::drawDirection(const Vec2* vec, const int size, Vec2 offset)
|
||||
{
|
||||
for (size_t i = 0; i < size; i++)
|
||||
{
|
||||
auto label = Label::createWithTTF(std::to_string(i).c_str(), "fonts/Marker Felt.ttf", 10);
|
||||
this->addChild(label);
|
||||
label->setPosition(vec[i] + offset);
|
||||
}
|
||||
}
|
||||
|
||||
string Issue829Test::title() const
|
||||
{
|
||||
return "GitHub Issue #829";
|
||||
}
|
||||
|
||||
string Issue829Test::subtitle() const
|
||||
{
|
||||
return "Is also fixed with #1319!";
|
||||
}
|
||||
|
||||
Issue1319Test::Issue1319Test()
|
||||
{
|
||||
Vec2 vertices21[] = {
|
||||
{290.250000f, 98.1250000f}, {235.000000f, 90.8750000f}, {270.500000f, 109.875000f}, {235.000000f, 119.125000f},
|
||||
{275.250000f, 145.875000f}, {249.500000f, 145.875000f}, {249.500000f, 178.125000f}, {275.250000f, 187.375015f},
|
||||
{294.750488f, 168.333344f}, {311.250000f, 181.125000f}, {257.000000f, 213.625015f}, {338.500000f, 193.125000f},
|
||||
{300.000000f, 211.125015f}, {333.750000f, 211.125015f}, {368.250000f, 206.625000f}, {377.000000f, 178.125000f},
|
||||
{421.750000f, 170.125000f}, {416.250000f, 115.375000f}, {391.250000f, 157.875000f}, {338.500000f, 131.625000f},
|
||||
{362.750000f, 131.625000f}, {362.750000f, 106.875000f}, {306.500000f, 119.125000f}, {324.250000f, 85.1250000f},
|
||||
{227.500000f, 61.8750000}};
|
||||
|
||||
Vec2 vertices24[] = {
|
||||
{45.750000f, 144.375000f}, {75.500000f, 136.875000f}, {75.500000f, 159.125000f}, {100.250000f, 161.375000f},
|
||||
{65.500000f, 181.375000f}, {102.250000f, 179.125000f}, {95.000000f, 215.125000f}, {129.331467f, 189.926208f},
|
||||
{131.371460f, 206.366196f}, {139.651474f, 192.446198f}, {161.851471f, 200.606201f}, {151.000000f, 220.375000f},
|
||||
{110.500000f, 244.375000f}, {153.750000f, 238.125000f}, {142.500000f, 253.875000f}, {220.750000f, 259.375000f},
|
||||
{250.500000f, 244.375000f}, {168.750000f, 241.875000f}, {182.250000f, 154.125000f}, {190.250000f, 227.375000f},
|
||||
{196.500000f, 197.375000f}, {208.750000f, 210.625000f}, {220.750000f, 194.375000f}, {208.750000f, 176.375000f},
|
||||
{253.250000f, 173.875000f}, {243.750000f, 154.125000f}, {213.750000f, 161.375000f}, {202.250000f, 139.875000f},
|
||||
{236.000000f, 131.875000f}, {218.500000f, 120.875000f}, {206.500000f, 125.625000f}, {184.500000f, 110.375000f},
|
||||
{157.000000f, 108.625000f}, {147.500000f, 96.625000f}, {153.750000f, 85.125000f}, {147.500000f, 75.375000f},
|
||||
{126.500000f, 74.125000f}, {110.500000f, 86.625000f}, {127.750000f, 85.125000f}, {135.250000f, 91.125000f},
|
||||
{135.250000f, 97.875000f}, {124.000000f, 93.875000f}, {115.500000f, 100.875000f}, {115.500000f, 111.875000f},
|
||||
{135.250000f, 108.625000f}, {151.000000f, 124.125000f}, {90.500000f, 131.875000f}, {113.250000f, 120.875000f},
|
||||
{88.000000f, 116.875000f}, {106.000000f, 103.875000f}, {88.000000f, 97.875000f},
|
||||
};
|
||||
|
||||
DrawNode* drawNode[3];
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
drawNode[i] = DrawNode::create();
|
||||
addChild(drawNode[i]);
|
||||
}
|
||||
|
||||
// draw a solid circle
|
||||
drawNode[1]->drawSolidCircle(VisibleRect::center() + Vec2(140.0f, 0.0f), 40, AX_DEGREES_TO_RADIANS(90), 30, 2.0f, 2.0f, Color4F::BLUE);
|
||||
|
||||
drawNode[1]->drawSolidCircle(VisibleRect::center() + Vec2(-40.0f, 0.0f), 40, AX_DEGREES_TO_RADIANS(90), 30, 2.0f, 2.0f, Color4F::WHITE);
|
||||
|
||||
drawNode[0]->setPosition(Vec2(-30, -20));
|
||||
drawNode[0]->drawPolygon(vertices24, sizeof(vertices24) / sizeof(vertices24[0]), Color4F::RED, 0.3f, Color4F::GREEN);
|
||||
|
||||
drawNode[2]->setPosition(Vec2(0, -10));
|
||||
drawNode[2]->setLocalZOrder(5);
|
||||
drawNode[2]->drawPolygon(vertices21, sizeof(vertices21) / sizeof(vertices21[0]), Color4F::GREEN, 0.3f, Color4F::YELLOW);
|
||||
drawNode[2]->drawPolygon(vertices24, sizeof(vertices24) / sizeof(vertices24[0]), Color4F::BLUE, 0.3f, Color4F::RED);
|
||||
}
|
||||
|
||||
string Issue1319Test::title() const
|
||||
{
|
||||
return "GitHub Issue #1319";
|
||||
}
|
||||
|
||||
string Issue1319Test::subtitle() const
|
||||
{
|
||||
return "Draw complex FILLED polygons";
|
||||
}
|
||||
|
|
@ -1,132 +0,0 @@
|
|||
/****************************************************************************
|
||||
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
||||
|
||||
https://axmol.dev/
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
#pragma once
|
||||
|
||||
#include "axmol.h"
|
||||
#include "ui/CocosGUI.h"
|
||||
#include "../BaseTest.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
DEFINE_TEST_SUITE(DrawPrimitivesTests);
|
||||
|
||||
class DrawPrimitivesBaseTest : public TestCase
|
||||
{
|
||||
public:
|
||||
virtual std::string title() const override;
|
||||
};
|
||||
|
||||
class DrawNodeTest : public DrawPrimitivesBaseTest
|
||||
{
|
||||
public:
|
||||
CREATE_FUNC(DrawNodeTest);
|
||||
|
||||
DrawNodeTest();
|
||||
|
||||
virtual std::string title() const override;
|
||||
virtual std::string subtitle() const override;
|
||||
};
|
||||
|
||||
class DrawNodeBackwardsAPITest : public DrawPrimitivesBaseTest
|
||||
{
|
||||
public:
|
||||
CREATE_FUNC(DrawNodeBackwardsAPITest);
|
||||
|
||||
DrawNodeBackwardsAPITest();
|
||||
|
||||
virtual std::string title() const override;
|
||||
virtual std::string subtitle() const override;
|
||||
};
|
||||
|
||||
class BetterCircleRendering : public DrawPrimitivesBaseTest
|
||||
{
|
||||
public:
|
||||
CREATE_FUNC(BetterCircleRendering);
|
||||
|
||||
BetterCircleRendering();
|
||||
|
||||
virtual std::string title() const override;
|
||||
virtual std::string subtitle() const override;
|
||||
void update(float dt);
|
||||
|
||||
void initSliders();
|
||||
void changeThreshold(Object* pSender, ax::ui::Slider::EventType type);
|
||||
void changeLineWidth(Object* pSender, ax::ui::Slider::EventType type);
|
||||
|
||||
private:
|
||||
ax::DrawNode* drawNode;
|
||||
ax::Label* _lineWidthLabel;
|
||||
float lineWidth = 0;
|
||||
ax::Label* _thresholdLabel;
|
||||
float threshold = 0;
|
||||
};
|
||||
|
||||
class Issue829Test : public DrawPrimitivesBaseTest
|
||||
{
|
||||
public:
|
||||
CREATE_FUNC(Issue829Test);
|
||||
|
||||
Issue829Test();
|
||||
void drawDirection(const ax::Vec2* vec, const int size, ax::Vec2 offset);
|
||||
|
||||
virtual std::string title() const override;
|
||||
virtual std::string subtitle() const override;
|
||||
};
|
||||
|
||||
class Issue1319Test : public DrawPrimitivesBaseTest
|
||||
{
|
||||
public:
|
||||
CREATE_FUNC(Issue1319Test);
|
||||
|
||||
Issue1319Test();
|
||||
|
||||
virtual std::string title() const override;
|
||||
virtual std::string subtitle() const override;
|
||||
};
|
||||
|
||||
class DrawNodeTestNewFeature1 : public DrawPrimitivesBaseTest
|
||||
{
|
||||
public:
|
||||
CREATE_FUNC(DrawNodeTestNewFeature1);
|
||||
|
||||
DrawNodeTestNewFeature1();
|
||||
|
||||
virtual std::string title() const override;
|
||||
virtual std::string subtitle() const override;
|
||||
void update(float dt);
|
||||
|
||||
void initSliders();
|
||||
void changeStartAngle(Object* pSender, ax::ui::Slider::EventType type);
|
||||
void changeEndAngle(Object* pSender, ax::ui::Slider::EventType type);
|
||||
void changeAngle(Object* pSender, ax::ui::Slider::EventType type);
|
||||
|
||||
private:
|
||||
ax::DrawNode* drawNode;
|
||||
ax::Label* _StartAngleLabel;
|
||||
float startAngle = 0;
|
||||
ax::Label* _EndAngleLabel;
|
||||
float endAngle = 0;
|
||||
ax::Label* _AngleLabel;
|
||||
float angle = 0;
|
||||
};
|
||||
|
|
@ -89,7 +89,6 @@ public:
|
|||
addTest("Node: Camera3D Test", []() { return new Camera3DTests(); });
|
||||
addTest("Node: Clipping", []() { return new ClippingNodeTests(); });
|
||||
addTest("Node: Draw", []() { return new DrawNodeTests(); });
|
||||
addTest("Node: Draw (cocos2dx)", []() { return new DrawPrimitivesTests(); });
|
||||
addTest("Node: Label - New API", []() { return new NewLabelTests(); });
|
||||
addTest("Node: Layer", []() { return new LayerTests(); });
|
||||
addTest("Node: Light", []() { return new LightTests(); });
|
||||
|
|
|
|||
|
|
@ -73,7 +73,6 @@
|
|||
#include "DataVisitorTest/DataVisitorTest.h"
|
||||
#include "NetworkTest/NetworkTest.h"
|
||||
#include "DrawNodeTest/DrawNodeTest.h"
|
||||
#include "DrawPrimitivesTest/DrawPrimitivesTest.h"
|
||||
#include "EffectsAdvancedTest/EffectsAdvancedTest.h"
|
||||
#include "EffectsTest/EffectsTest.h"
|
||||
#include "ExtensionsTest/ExtensionsTest.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue