|
|
@ -11,6 +11,7 @@
|
|
|
|
#include "Painting/ShortCutTree.h"
|
|
|
|
#include "Painting/ShortCutTree.h"
|
|
|
|
#include "Painting/Painting.h"
|
|
|
|
#include "Painting/Painting.h"
|
|
|
|
#include "../SvgParser.h"
|
|
|
|
#include "../SvgParser.h"
|
|
|
|
|
|
|
|
#include <ThirdPartyLib/qquick/qquicksvgparser_p.h>
|
|
|
|
|
|
|
|
|
|
|
|
using namespace Renderer;
|
|
|
|
using namespace Renderer;
|
|
|
|
using std::vector;
|
|
|
|
using std::vector;
|
|
|
@ -118,7 +119,7 @@ std::unique_ptr<Drawable> Model::processMesh(aiMesh* mesh, const aiScene* scene,
|
|
|
|
aiString str;
|
|
|
|
aiString str;
|
|
|
|
material->GetTexture(aiTextureType_BASE_COLOR, 0, &str);
|
|
|
|
material->GetTexture(aiTextureType_BASE_COLOR, 0, &str);
|
|
|
|
|
|
|
|
|
|
|
|
if (paintingProgram != nullptr && std::strcmp(str.C_Str(), "17876391417123941155.jpg") == 0)
|
|
|
|
if (paintingProgram != nullptr && ( std::strcmp(str.C_Str(), "17876391417123941155.jpg") == 0 || std::strcmp(str.C_Str(), "11474523244911310074.jpg") == 0))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
qDebug() << str.C_Str() << "Replaced";
|
|
|
|
qDebug() << str.C_Str() << "Replaced";
|
|
|
|
// ³õʼ»¯Íø¸ñ
|
|
|
|
// ³õʼ»¯Íø¸ñ
|
|
|
@ -233,72 +234,12 @@ GLuint Renderer::Model::loadPainting(std::string path)
|
|
|
|
if (iter != paintingLoaded.end())
|
|
|
|
if (iter != paintingLoaded.end())
|
|
|
|
return iter->second;
|
|
|
|
return iter->second;
|
|
|
|
|
|
|
|
|
|
|
|
//vector < vector <Point>> lineSet = {
|
|
|
|
|
|
|
|
// {{-0.5,0.9}, {0.1,0.3}},
|
|
|
|
|
|
|
|
// {{0.1,0.3}, {0.0204656,0.379534}, {-0.2,0.0632573}, {-0.2,0.175736}},
|
|
|
|
|
|
|
|
// {{-0.2,0.175736}, {-0.2,0.288215}, {-0.579534,0.220466}, {-0.5,0.3}},
|
|
|
|
|
|
|
|
// {{-0.5,0.3}, {-0.420466,0.379534}, {-0.736743,0.6}, {-0.624264,0.6}},
|
|
|
|
|
|
|
|
// {{-0.624264,0.6}, {-0.511785,0.6}, {-0.579534,0.979534}, {-0.5,0.9}}
|
|
|
|
|
|
|
|
//};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//Contour ctr = SvgParser("M308.49,212.25l23,28.38-82,78.31c-14.28,13.64-26.34-20.6-53.44,9.32l-30.24-13.4,63.56-51.59L190.71,215.6l-32.92,26.72L149.5,232.1l32.92-26.72L173.2,194l-32.91,26.72-7.38-9.08L165.83,185l-38.69-47.66L94.22,164,85,152.65l32.91-26.72-9.21-11.35L75.79,141.3l-5.53-6.81,32.92-26.72L94,96.42,61.05,123.14l-12-14.76L37.72,117.6l12,14.75L30.41,148,0,110.55,136.2,0l30.4,37.46L147.31,53.12l-12-14.76L124,47.58l12,14.75L103.05,89.05l9.21,11.35,32.92-26.72,5.52,6.81-32.91,26.72L127,118.56l32.92-26.72,9.21,11.35-32.91,26.72,38.69,47.67,32.91-26.72,7.37,9.08-32.91,26.72L191.49,198l32.92-26.72,8.29,10.22-32.92,26.71,38.7,47.68L302,204.3l6.45,7.95Z", 331.52, 328.26).parse();
|
|
|
|
|
|
|
|
//ctr = Contour(ctr.begin()+1 , ctr.begin() + 4);
|
|
|
|
|
|
|
|
//qDebug() << "Contour---------------------";
|
|
|
|
|
|
|
|
//for (auto& line : ctr)
|
|
|
|
|
|
|
|
//{
|
|
|
|
|
|
|
|
// for (auto& p : line)
|
|
|
|
|
|
|
|
// p.show();
|
|
|
|
|
|
|
|
// std::cout << std::endl;
|
|
|
|
|
|
|
|
//}
|
|
|
|
|
|
|
|
//qDebug() << "----------------------------";
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
vector<std::shared_ptr<Contour>> contour = {
|
|
|
|
vector<std::shared_ptr<Contour>> contour = {
|
|
|
|
std::make_shared<Contour>(SvgParser("M100,100C-.5,100,0,100.5,0,0L40,.07C40,59.5,39.5,60,100,60Z", 100, 100).parse()),
|
|
|
|
std::make_shared<Contour>(SvgParser("M100,100C-.5,100,0,100.5,0,0L40,.07C40,59.5,39.5,60,100,60Z", 100, 100).parse()),
|
|
|
|
//std::make_shared<Contour>(SvgParser("M292.82,107.78s0,0,0,0,0,3.59,0,7.62c0,3.85,0,5.78.06,6.43a19.94,19.94,0,0,0,2.87,7.58,15.85,15.85,0,0,0,6.61,6.23A14.75,14.75,0,0,0,310,137a11.69,11.69,0,0,0,7.59-2.92,11,11,0,0,0,3.2-6.84c.15-1.27.58-4.84-1.79-7.64a8.54,8.54,0,0,0-3.56-2.44c-1.32-.52-3.32-1.31-5.06-.33a5.41,5.41,0,0,0-2.14,3,3.48,3.48,0,0,0-.16,2.71c.78,1.86,3.36,2.14,3.47,2.15", 29.07, 30.28).parse()),
|
|
|
|
|
|
|
|
std::make_shared<Contour>(SvgParser("M308.49,212.25l23,28.38-82,78.31c-14.28,13.64-26.34-20.6-53.44,9.32l-30.24-13.4,63.56-51.59L190.71,215.6l-32.92,26.72L149.5,232.1l32.92-26.72L173.2,194l-32.91,26.72-7.38-9.08L165.83,185l-38.69-47.66L94.22,164,85,152.65l32.91-26.72-9.21-11.35L75.79,141.3l-5.53-6.81,32.92-26.72L94,96.42,61.05,123.14l-12-14.76L37.72,117.6l12,14.75L30.41,148,0,110.55,136.2,0l30.4,37.46L147.31,53.12l-12-14.76L124,47.58l12,14.75L103.05,89.05l9.21,11.35,32.92-26.72,5.52,6.81-32.91,26.72L127,118.56l32.92-26.72,9.21,11.35-32.91,26.72,38.69,47.67,32.91-26.72,7.37,9.08-32.91,26.72L191.49,198l32.92-26.72,8.29,10.22-32.92,26.71,38.7,47.68L302,204.3l6.45,7.95Z", 331.52, 328.26).parse()),
|
|
|
|
std::make_shared<Contour>(SvgParser("M308.49,212.25l23,28.38-82,78.31c-14.28,13.64-26.34-20.6-53.44,9.32l-30.24-13.4,63.56-51.59L190.71,215.6l-32.92,26.72L149.5,232.1l32.92-26.72L173.2,194l-32.91,26.72-7.38-9.08L165.83,185l-38.69-47.66L94.22,164,85,152.65l32.91-26.72-9.21-11.35L75.79,141.3l-5.53-6.81,32.92-26.72L94,96.42,61.05,123.14l-12-14.76L37.72,117.6l12,14.75L30.41,148,0,110.55,136.2,0l30.4,37.46L147.31,53.12l-12-14.76L124,47.58l12,14.75L103.05,89.05l9.21,11.35,32.92-26.72,5.52,6.81-32.91,26.72L127,118.56l32.92-26.72,9.21,11.35-32.91,26.72,38.69,47.67,32.91-26.72,7.37,9.08-32.91,26.72L191.49,198l32.92-26.72,8.29,10.22-32.92,26.71,38.7,47.68L302,204.3l6.45,7.95Z", 331.52, 328.26).parse()),
|
|
|
|
std::make_shared<Contour>(SvgParser("M377,459.61a11.26,11.26,0,0,1,11.27-11.27H696.12a11.27,11.27,0,0,0,11-8.62A359.84,359.84,0,0,0,708,280.56a11.26,11.26,0,0,0-11-8.73H388.27A11.26,11.26,0,0,1,377,260.57h0a11.26,11.26,0,0,1,11.27-11.26H683.71A11.32,11.32,0,0,0,694.28,234C649.8,113.69,542.57,23.85,412.3,4.12a11.22,11.22,0,0,0-12.76,11.17v158.9a11.26,11.26,0,0,0,11.26,11.27H583.12a11.32,11.32,0,0,0,9.26-17.75c-31.67-46.59-78.51-75.2-109.11-90.07a11.25,11.25,0,0,0-16.13,10.17V115.2a11.24,11.24,0,0,0,6.22,10.07l7.51,3.76a11.28,11.28,0,0,1,5,15.12h0a11.27,11.27,0,0,1-15.11,5l-20-10a11.27,11.27,0,0,1-6.22-10.07V54a11.27,11.27,0,0,1,14.62-10.75c5.11,1.59,125.66,40.35,172.24,149A11.27,11.27,0,0,1,621.11,208H388.27A11.26,11.26,0,0,1,377,196.73V11.36A11.32,11.32,0,0,0,365.89.08C363.34,0,360.79,0,358.22,0s-5.11,0-7.66.08a11.32,11.32,0,0,0-11.11,11.28V196.74A11.26,11.26,0,0,1,328.18,208H95.35A11.27,11.27,0,0,1,85,192.3c46.57-108.67,167.12-147.42,172.23-149A11.26,11.26,0,0,1,271.86,54v75.11a11.25,11.25,0,0,1-6.23,10.07l-20,10a11.27,11.27,0,0,1-15.11-5h0a11.26,11.26,0,0,1,5-15.11l7.52-3.76a11.27,11.27,0,0,0,6.22-10.07V87.82a11.25,11.25,0,0,0-16.14-10.16c-30.6,14.87-77.45,43.48-109.1,90.07a11.3,11.3,0,0,0,9.25,17.74H305.66a11.26,11.26,0,0,0,11.27-11.26V15.31A11.22,11.22,0,0,0,304.17,4.14C173.88,23.86,66.66,113.71,22.17,234a11.32,11.32,0,0,0,10.56,15.29H328.18a11.26,11.26,0,0,1,11.27,11.26v0a11.26,11.26,0,0,1-11.27,11.26H19.52a11.26,11.26,0,0,0-11,8.72,359.84,359.84,0,0,0,.83,159.16,11.26,11.26,0,0,0,11,8.61H328.18a11.26,11.26,0,0,1,11.27,11.27h0a11.26,11.26,0,0,1-11.27,11.26h-294a11.32,11.32,0,0,0-10.53,15.4C69,604.65,175.3,692.78,304.16,712.3a11.21,11.21,0,0,0,12.76-11.16V542.22A11.26,11.26,0,0,0,305.66,531h-166c-9.53,0-14.89,11.22-8.69,18.47,34.09,39.77,74.45,65.66,101.77,80.18a11.25,11.25,0,0,0,16.53-10V591a11.26,11.26,0,0,1,11.26-11.26h0A11.26,11.26,0,0,1,271.85,591v63.85A11.27,11.27,0,0,1,256.8,665.5c-4.45-1.59-109.58-40-171-139.9a11.27,11.27,0,0,1,9.59-17.17H328.18a11.26,11.26,0,0,1,11.27,11.26V705.08a11.32,11.32,0,0,0,11.11,11.28q3.82.07,7.66.08c2.57,0,5.12,0,7.67-.08A11.32,11.32,0,0,0,377,705.08V519.69a11.25,11.25,0,0,1,11.27-11.26H621.1a11.26,11.26,0,0,1,9.59,17.16c-61.46,99.87-166.59,138.3-171,139.9a11.27,11.27,0,0,1-15-10.61V591a11.26,11.26,0,0,1,11.26-11.26h0A11.26,11.26,0,0,1,467.14,591v28.6a11.25,11.25,0,0,0,16.53,10c27.33-14.53,67.68-40.42,101.77-80.19,6.2-7.23.85-18.46-8.69-18.46h-166a11.26,11.26,0,0,0-11.26,11.26V701.12a11.21,11.21,0,0,0,12.76,11.17c128.86-19.51,235.14-107.66,280.48-226a11.33,11.33,0,0,0-10.53-15.41h-294A11.25,11.25,0,0,1,377,459.61ZM35.27,399.53V316.9a11.26,11.26,0,0,1,11.27-11.26H669.92a11.25,11.25,0,0,1,11.26,11.26v82.63a11.25,11.25,0,0,1-11.26,11.26H46.54a11.27,11.27,0,0,1-11.27-11.26Z", 716.45, 716.44).parse())
|
|
|
|
std::make_shared<Contour>(SvgParser("M377,459.61a11.26,11.26,0,0,1,11.27-11.27H696.12a11.27,11.27,0,0,0,11-8.62A359.84,359.84,0,0,0,708,280.56a11.26,11.26,0,0,0-11-8.73H388.27A11.26,11.26,0,0,1,377,260.57h0a11.26,11.26,0,0,1,11.27-11.26H683.71A11.32,11.32,0,0,0,694.28,234C649.8,113.69,542.57,23.85,412.3,4.12a11.22,11.22,0,0,0-12.76,11.17v158.9a11.26,11.26,0,0,0,11.26,11.27H583.12a11.32,11.32,0,0,0,9.26-17.75c-31.67-46.59-78.51-75.2-109.11-90.07a11.25,11.25,0,0,0-16.13,10.17V115.2a11.24,11.24,0,0,0,6.22,10.07l7.51,3.76a11.28,11.28,0,0,1,5,15.12h0a11.27,11.27,0,0,1-15.11,5l-20-10a11.27,11.27,0,0,1-6.22-10.07V54a11.27,11.27,0,0,1,14.62-10.75c5.11,1.59,125.66,40.35,172.24,149A11.27,11.27,0,0,1,621.11,208H388.27A11.26,11.26,0,0,1,377,196.73V11.36A11.32,11.32,0,0,0,365.89.08C363.34,0,360.79,0,358.22,0s-5.11,0-7.66.08a11.32,11.32,0,0,0-11.11,11.28V196.74A11.26,11.26,0,0,1,328.18,208H95.35A11.27,11.27,0,0,1,85,192.3c46.57-108.67,167.12-147.42,172.23-149A11.26,11.26,0,0,1,271.86,54v75.11a11.25,11.25,0,0,1-6.23,10.07l-20,10a11.27,11.27,0,0,1-15.11-5h0a11.26,11.26,0,0,1,5-15.11l7.52-3.76a11.27,11.27,0,0,0,6.22-10.07V87.82a11.25,11.25,0,0,0-16.14-10.16c-30.6,14.87-77.45,43.48-109.1,90.07a11.3,11.3,0,0,0,9.25,17.74H305.66a11.26,11.26,0,0,0,11.27-11.26V15.31A11.22,11.22,0,0,0,304.17,4.14C173.88,23.86,66.66,113.71,22.17,234a11.32,11.32,0,0,0,10.56,15.29H328.18a11.26,11.26,0,0,1,11.27,11.26v0a11.26,11.26,0,0,1-11.27,11.26H19.52a11.26,11.26,0,0,0-11,8.72,359.84,359.84,0,0,0,.83,159.16,11.26,11.26,0,0,0,11,8.61H328.18a11.26,11.26,0,0,1,11.27,11.27h0a11.26,11.26,0,0,1-11.27,11.26h-294a11.32,11.32,0,0,0-10.53,15.4C69,604.65,175.3,692.78,304.16,712.3a11.21,11.21,0,0,0,12.76-11.16V542.22A11.26,11.26,0,0,0,305.66,531h-166c-9.53,0-14.89,11.22-8.69,18.47,34.09,39.77,74.45,65.66,101.77,80.18a11.25,11.25,0,0,0,16.53-10V591a11.26,11.26,0,0,1,11.26-11.26h0A11.26,11.26,0,0,1,271.85,591v63.85A11.27,11.27,0,0,1,256.8,665.5c-4.45-1.59-109.58-40-171-139.9a11.27,11.27,0,0,1,9.59-17.17H328.18a11.26,11.26,0,0,1,11.27,11.26V705.08a11.32,11.32,0,0,0,11.11,11.28q3.82.07,7.66.08c2.57,0,5.12,0,7.67-.08A11.32,11.32,0,0,0,377,705.08V519.69a11.25,11.25,0,0,1,11.27-11.26H621.1a11.26,11.26,0,0,1,9.59,17.16c-61.46,99.87-166.59,138.3-171,139.9a11.27,11.27,0,0,1-15-10.61V591a11.26,11.26,0,0,1,11.26-11.26h0A11.26,11.26,0,0,1,467.14,591v28.6a11.25,11.25,0,0,0,16.53,10c27.33-14.53,67.68-40.42,101.77-80.19,6.2-7.23.85-18.46-8.69-18.46h-166a11.26,11.26,0,0,0-11.26,11.26V701.12a11.21,11.21,0,0,0,12.76,11.17c128.86-19.51,235.14-107.66,280.48-226a11.33,11.33,0,0,0-10.53-15.41h-294A11.25,11.25,0,0,1,377,459.61ZM35.27,399.53V316.9a11.26,11.26,0,0,1,11.27-11.26H669.92a11.25,11.25,0,0,1,11.26,11.26v82.63a11.25,11.25,0,0,1-11.26,11.26H46.54a11.27,11.27,0,0,1-11.27-11.26Z", 716.45, 716.44).parse())
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
//vector<std::shared_ptr<ElementStyle>> style = {
|
|
|
|
|
|
|
|
// std::make_shared<ElementStyle>(std::vector<GLfloat>{
|
|
|
|
|
|
|
|
// //strokeStyle
|
|
|
|
|
|
|
|
// //stroke
|
|
|
|
|
|
|
|
// 1,
|
|
|
|
|
|
|
|
// //strokeWidth
|
|
|
|
|
|
|
|
// 0.02,
|
|
|
|
|
|
|
|
// //strokeEndType
|
|
|
|
|
|
|
|
// 0, //圆角
|
|
|
|
|
|
|
|
// //strokeFillType
|
|
|
|
|
|
|
|
// 0, //单色
|
|
|
|
|
|
|
|
// //线类型
|
|
|
|
|
|
|
|
// 0, //双侧
|
|
|
|
|
|
|
|
// //线外描边宽度
|
|
|
|
|
|
|
|
// 0,
|
|
|
|
|
|
|
|
// //线外描边方式
|
|
|
|
|
|
|
|
// 0, //单色
|
|
|
|
|
|
|
|
// //strokeFillColorMetallicRoughness
|
|
|
|
|
|
|
|
// 1,0,1, 0,0.8,
|
|
|
|
|
|
|
|
// }),
|
|
|
|
|
|
|
|
// std::make_shared<ElementStyle>(std::vector<GLfloat>{
|
|
|
|
|
|
|
|
// //fillStyle
|
|
|
|
|
|
|
|
// //fill
|
|
|
|
|
|
|
|
// 0,
|
|
|
|
|
|
|
|
// //fillType
|
|
|
|
|
|
|
|
// 0, //单色
|
|
|
|
|
|
|
|
// //fillColorMetallicRoughness
|
|
|
|
|
|
|
|
// 240 / 255., 220 / 255., 160 / 255., 0.996, 0.18,
|
|
|
|
|
|
|
|
// }),
|
|
|
|
|
|
|
|
// std::make_shared<ElementStyle>(std::vector<GLfloat>{
|
|
|
|
|
|
|
|
// //fillStyle
|
|
|
|
|
|
|
|
// //fill
|
|
|
|
|
|
|
|
// 0,
|
|
|
|
|
|
|
|
// //fillType
|
|
|
|
|
|
|
|
// 0, //单色
|
|
|
|
|
|
|
|
// //fillColorMetallicRoughness
|
|
|
|
|
|
|
|
// 24 / 255., 220 / 255., 16 / 255., 0., 0.18,
|
|
|
|
|
|
|
|
// }),
|
|
|
|
|
|
|
|
//};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
vector<std::shared_ptr<ElementStyle>> style = {
|
|
|
|
vector<std::shared_ptr<ElementStyle>> style = {
|
|
|
|
std::make_shared<ElementStyleFillDemo>(),
|
|
|
|
std::make_shared<ElementStyleFillDemo>(),
|
|
|
|
std::make_shared<ElementStyleStrokeDemo>(0.02),
|
|
|
|
std::make_shared<ElementStyleStrokeDemo>(0.02),
|
|
|
@ -311,164 +252,25 @@ GLuint Renderer::Model::loadPainting(std::string path)
|
|
|
|
std::make_shared<Element>(Element{ contour[2], style[0]}),
|
|
|
|
std::make_shared<Element>(Element{ contour[2], style[0]}),
|
|
|
|
};
|
|
|
|
};
|
|
|
|
Painting painting;
|
|
|
|
Painting painting;
|
|
|
|
for (int i = 0; i < 1000; i++)
|
|
|
|
|
|
|
|
|
|
|
|
if (path == "17876391417123941155.jpg")
|
|
|
|
{
|
|
|
|
{
|
|
|
|
float x = (float)rand() / RAND_MAX * 2 - 1;
|
|
|
|
painting.addElement(*element[0], ElementTransform{ glm::vec2(-0.5,-0.45), glm::vec2(0.6,0.7), 45, glm::bvec2(true, false), 0 });
|
|
|
|
float y = (float)rand() / RAND_MAX * 2 - 1;
|
|
|
|
painting.addElement(*element[1], ElementTransform{ glm::vec2(-0.45,0.45), glm::vec2(0.5,0.5), 0, glm::bvec2(false), 0 });
|
|
|
|
float z = 0.05 + x;//(float)rand() / RAND_MAX * (0.1) + x;
|
|
|
|
painting.addElement(*element[2], ElementTransform{ glm::vec2(0.5,-0.45), glm::vec2(0.6,0.7), 0, glm::bvec2(false), 0 });
|
|
|
|
float w = 0.05 + y;//(float)rand() / RAND_MAX * (0.1) + y;
|
|
|
|
}
|
|
|
|
//rootBvhTreeData.push_back(BvhTreeData(QVector4D(x, y, z, w), 0, encodeZIndexAngle(1, (float)rand() / RAND_MAX * 360)));
|
|
|
|
else
|
|
|
|
//painting.addElement(element[i%3], QVector4D(x, y, z, w), (float)rand() / RAND_MAX * 360, 1);
|
|
|
|
{
|
|
|
|
//painting.addElement(*element[i%3], ElementTransform{ glm::vec2(x,y), glm::vec2(0.05), (float)rand() / RAND_MAX * 360, glm::bvec2(false), 0 });
|
|
|
|
for (int i = 0; i < 1000; i++)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
float x = (float)rand() / RAND_MAX * 2 - 1;
|
|
|
|
|
|
|
|
float y = (float)rand() / RAND_MAX * 2 - 1;
|
|
|
|
|
|
|
|
painting.addElement(*element[i%3], ElementTransform{ glm::vec2(x,y), glm::vec2(0.05), (float)rand() / RAND_MAX * 360, glm::bvec2(false), 0 });
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
painting.addElement(*element[0], ElementTransform{ glm::vec2(-0.5,-0.45), glm::vec2(0.6,0.7), 45, glm::bvec2(true, false), 0 });
|
|
|
|
|
|
|
|
painting.addElement(*element[1], ElementTransform{ glm::vec2(-0.45,0.45), glm::vec2(0.5,0.5), 0, glm::bvec2(false), 0 });
|
|
|
|
|
|
|
|
painting.addElement(*element[2], ElementTransform{ glm::vec2(0.5,-0.45), glm::vec2(0.6,0.7), 0, glm::bvec2(false), 0 });
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//painting.addElement(element[0], QVector4D(-0.8, -0.8, -0.2, -0.1), 0, 0);
|
|
|
|
|
|
|
|
//painting.addElement(element[1], QVector4D(-0.7, 0.2, -0.2, 0.7), 0, 0);
|
|
|
|
|
|
|
|
//painting.addElement(element[2], QVector4D(0.2, -0.8, 0.8, -0.1), 0, 0);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
painting.generateBuffers(glFunc);
|
|
|
|
painting.generateBuffers(glFunc);
|
|
|
|
/////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
std::vector<GLuint> bvhChildren0 = {
|
|
|
|
|
|
|
|
//root
|
|
|
|
|
|
|
|
1,2,
|
|
|
|
|
|
|
|
3,4, 5,6,
|
|
|
|
|
|
|
|
encodeChild(2),0, encodeChild(1),GLuint(30. / 360 * 65536 + 1 * 65536) /*右儿子用来表示旋转角度和zIndex*/, encodeChild(3),0, encodeChild(0),0,
|
|
|
|
|
|
|
|
//elememt0
|
|
|
|
|
|
|
|
1,2,
|
|
|
|
|
|
|
|
encodeChild(20)/*contour索引,由于contour不定长,这里需要给到contour在elementIndex中位置*/,0/*封闭图形*/, encodeChild(24), 0,
|
|
|
|
|
|
|
|
//elememt1
|
|
|
|
|
|
|
|
encodeChild(12)/*contour索引*/, 1/*线*/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
std::vector<QVector4D> bvhBounds0 = {
|
|
|
|
|
|
|
|
//root
|
|
|
|
|
|
|
|
QVector4D(-1,-1,1,1),
|
|
|
|
|
|
|
|
QVector4D(-0.9,-0.9,-0.1,0.9), QVector4D(0.1, -0.9,0.9,0.9),
|
|
|
|
|
|
|
|
QVector4D(-0.8,-0.8,-0.2,-0.1), QVector4D(-0.7,0.2,-0.2,0.7), QVector4D(0.2,-0.8,0.8,-0.1), QVector4D(0.3,0.2,0.7,0.7),
|
|
|
|
|
|
|
|
//elememt0
|
|
|
|
|
|
|
|
QVector4D(-1,-1,1,1),
|
|
|
|
|
|
|
|
QVector4D(-1,-1,-0.2,1), QVector4D(-0.2,-1,1,1),
|
|
|
|
|
|
|
|
//elememt1
|
|
|
|
|
|
|
|
QVector4D(-1,-1,1,1)
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* @[0] elementBvhRoot
|
|
|
|
|
|
|
|
* @[1] styleOffset
|
|
|
|
|
|
|
|
* @[2] pointsOffset
|
|
|
|
|
|
|
|
* @[3] linesOffset
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
std::vector<glm::uvec4> elementOffset0 = {
|
|
|
|
|
|
|
|
//element0
|
|
|
|
|
|
|
|
glm::uvec4(7, 14, 0, 0),
|
|
|
|
|
|
|
|
//element1
|
|
|
|
|
|
|
|
glm::uvec4(10, 39, 21, 28),
|
|
|
|
|
|
|
|
//element2
|
|
|
|
|
|
|
|
glm::uvec4(10, 51, 21, 28),
|
|
|
|
|
|
|
|
//element3
|
|
|
|
|
|
|
|
glm::uvec4(10, 63, 21, 28),
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
std::vector<GLuint> elementIndex0 = {
|
|
|
|
|
|
|
|
//element0
|
|
|
|
|
|
|
|
//lines, 全部当作三阶贝塞尔, 每条线四个点索引
|
|
|
|
|
|
|
|
0,1,1,2,
|
|
|
|
|
|
|
|
0,0,3,3,
|
|
|
|
|
|
|
|
3,4,4,5,
|
|
|
|
|
|
|
|
2,2,5,5,
|
|
|
|
|
|
|
|
5,5,6,6,
|
|
|
|
|
|
|
|
//contours, 第一个元素为线数,后面为轮廓线索引
|
|
|
|
|
|
|
|
3, 1,2,4,
|
|
|
|
|
|
|
|
3, 0,2,3,
|
|
|
|
|
|
|
|
//element1
|
|
|
|
|
|
|
|
//lines
|
|
|
|
|
|
|
|
0,7,8,1,
|
|
|
|
|
|
|
|
1,1,4,4,
|
|
|
|
|
|
|
|
5,5,6,6,
|
|
|
|
|
|
|
|
//contours
|
|
|
|
|
|
|
|
3, 0,1,2
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
std::vector<GLfloat> elementData0 = {
|
|
|
|
|
|
|
|
//element0
|
|
|
|
|
|
|
|
//points
|
|
|
|
|
|
|
|
-0.2,1, -0.2,-0.2, 1,-0.2, -1,1, -1,-1, 1,-1, 1,1,
|
|
|
|
|
|
|
|
//fillStyle
|
|
|
|
|
|
|
|
//fill
|
|
|
|
|
|
|
|
0,
|
|
|
|
|
|
|
|
//fillType
|
|
|
|
|
|
|
|
0, //单色
|
|
|
|
|
|
|
|
//fillColorMetallicRoughness
|
|
|
|
|
|
|
|
1,1,0, 0,0.8,
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//element1
|
|
|
|
|
|
|
|
//points
|
|
|
|
|
|
|
|
0.5,-0.5, 0.5,0.5, -0.2,0.5, -0.5,0.2, -0.5,-0.5, -0.8,-0.5, -0.8,0.5, 0.5,-0.4, 0.5,0.4,
|
|
|
|
|
|
|
|
//strokeStyle
|
|
|
|
|
|
|
|
//stroke
|
|
|
|
|
|
|
|
1,
|
|
|
|
|
|
|
|
//strokeWidth
|
|
|
|
|
|
|
|
0.1,
|
|
|
|
|
|
|
|
//strokeEndType
|
|
|
|
|
|
|
|
0, //圆角
|
|
|
|
|
|
|
|
//strokeFillType
|
|
|
|
|
|
|
|
0, //单色
|
|
|
|
|
|
|
|
//线类型
|
|
|
|
|
|
|
|
2, //左侧
|
|
|
|
|
|
|
|
//线外描边宽度
|
|
|
|
|
|
|
|
0,
|
|
|
|
|
|
|
|
//线外描边方式
|
|
|
|
|
|
|
|
0, //单色
|
|
|
|
|
|
|
|
//strokeFillColorMetallicRoughness
|
|
|
|
|
|
|
|
1,0,1, 0,0.8,
|
|
|
|
|
|
|
|
//strokeStyle
|
|
|
|
|
|
|
|
//stroke
|
|
|
|
|
|
|
|
1,
|
|
|
|
|
|
|
|
//strokeWidth
|
|
|
|
|
|
|
|
0.1,
|
|
|
|
|
|
|
|
//strokeEndType
|
|
|
|
|
|
|
|
0, //圆角
|
|
|
|
|
|
|
|
//strokeFillType
|
|
|
|
|
|
|
|
2, //单色
|
|
|
|
|
|
|
|
//线类型
|
|
|
|
|
|
|
|
1, //左侧
|
|
|
|
|
|
|
|
//线外描边宽度
|
|
|
|
|
|
|
|
0,
|
|
|
|
|
|
|
|
//线外描边方式
|
|
|
|
|
|
|
|
0, //单色
|
|
|
|
|
|
|
|
//strokeFillColorMetallicRoughness
|
|
|
|
|
|
|
|
1,0,1, 0,0.8,
|
|
|
|
|
|
|
|
//strokeStyle
|
|
|
|
|
|
|
|
//stroke
|
|
|
|
|
|
|
|
1,
|
|
|
|
|
|
|
|
//strokeWidth
|
|
|
|
|
|
|
|
0.1,
|
|
|
|
|
|
|
|
//strokeEndType
|
|
|
|
|
|
|
|
0, //圆角
|
|
|
|
|
|
|
|
//strokeFillType
|
|
|
|
|
|
|
|
1, //单色
|
|
|
|
|
|
|
|
//线类型
|
|
|
|
|
|
|
|
0, //左侧
|
|
|
|
|
|
|
|
//线外描边宽度
|
|
|
|
|
|
|
|
0,
|
|
|
|
|
|
|
|
//线外描边方式
|
|
|
|
|
|
|
|
0, //单色
|
|
|
|
|
|
|
|
//strokeFillColorMetallicRoughness
|
|
|
|
|
|
|
|
1,0,1, 0,0.8,
|
|
|
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//m_mesh->paintingIndex = paintingHelper->addPainting(bounds.size(), std::vector<GLuint>(children.begin()+2, children.end()), bounds,
|
|
|
|
|
|
|
|
// elementOffset, elementIndex, elementData);
|
|
|
|
|
|
|
|
/*GLuint index = paintingHelper->addPainting(bvhChildren0, bvhBounds0,
|
|
|
|
|
|
|
|
elementOffset0, elementIndex0, elementData0);*/
|
|
|
|
|
|
|
|
//GLuint index = paintingHelper->addPainting(painting);
|
|
|
|
|
|
|
|
//paintingLoaded.insert({ path, index });
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
auto index = vtManager->createVirtualTexture(painting);
|
|
|
|
auto index = vtManager->createVirtualTexture(painting);
|
|
|
|
paintingLoaded.emplace(path, index);
|
|
|
|
paintingLoaded.emplace(path, index);
|
|
|
|