zcy
/
dust3d
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix triangulation of uv unwrapping

master
Jeremy Hu 2019-01-24 23:57:47 +09:30
parent 85adf5d1f8
commit 8ace5b43de
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dust3d.pro
View File

@ -12,10 +12,10 @@ macx {
} }
isEmpty(HUMAN_VERSION) { isEmpty(HUMAN_VERSION) {
HUMAN_VERSION = "1.0.0-beta.14" HUMAN_VERSION = "1.0.0-beta.15"
} }
isEmpty(VERSION) { isEmpty(VERSION) {
VERSION = 1.0.0.14 VERSION = 1.0.0.15
} }
REPOSITORY_URL = "https://github.com/huxingyi/dust3d" REPOSITORY_URL = "https://github.com/huxingyi/dust3d"
@ -25,7 +25,7 @@ REFERENCE_GUIDE_URL = "http://docs.dust3d.org"
QMAKE_TARGET_COMPANY = Dust3D QMAKE_TARGET_COMPANY = Dust3D
QMAKE_TARGET_PRODUCT = Dust3D QMAKE_TARGET_PRODUCT = Dust3D
QMAKE_TARGET_DESCRIPTION = "Dust3D is a cross-platform open-source 3D modeling software" QMAKE_TARGET_DESCRIPTION = "Dust3D is a cross-platform open-source 3D modeling software"
QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2018 Dust3D Project. All Rights Reserved." QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2018-2019 Dust3D Project. All Rights Reserved."
DEFINES += "PROJECT_DEFINED_APP_COMPANY=\"\\\"$$QMAKE_TARGET_COMPANY\\\"\"" DEFINES += "PROJECT_DEFINED_APP_COMPANY=\"\\\"$$QMAKE_TARGET_COMPANY\\\"\""
DEFINES += "PROJECT_DEFINED_APP_NAME=\"\\\"$$QMAKE_TARGET_PRODUCT\\\"\"" DEFINES += "PROJECT_DEFINED_APP_NAME=\"\\\"$$QMAKE_TARGET_PRODUCT\\\"\""

2
thirdparty/simpleuv/simpleuv/triangulate.cpp vendored
View File

@ -15,7 +15,7 @@ static QVector3D norm(const QVector3D &p1, const QVector3D &p2, const QVector3D
static float angle360(const QVector3D &a, const QVector3D &b, const QVector3D &direct) static float angle360(const QVector3D &a, const QVector3D &b, const QVector3D &direct)
{ {
auto angle = std::acos(QVector3D::dotProduct(a, b)) * 180.0 / 3.1415926; auto angle = atan2(QVector3D::crossProduct(a, b).length(), QVector3D::dotProduct(a, b)) * 180.0 / 3.1415926;
auto c = QVector3D::crossProduct(a, b); auto c = QVector3D::crossProduct(a, b);
if (QVector3D::dotProduct(c, direct) < 0) { if (QVector3D::dotProduct(c, direct) < 0) {
angle += 180; angle += 180;