github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-15 06:05:58 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Geom: fixed to compile

Browse source
This commit is contained in:
Mirek Fidler 2024-07-15 18:04:47 +02:00
parent 0083b72b1b
commit c33f654c9a
2 changed files with 62 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/Geom/fp3.cpp
View file

@ -127,6 +127,8 @@ void Box3::Union(Pointf3 pt)
//////////////////////////////////////////////////////////////////////
// Matrix3::
#define GLOBAL_VARP_INIT(a, b, c) a & b() { static a m c; return m; }
GLOBAL_VARP_INIT(const Matrixf3, Matrixf3_0, (0, 0, 0, 0, 0, 0, 0, 0, 0))
GLOBAL_VARP_INIT(const Matrixf3, Matrixf3_1, (1, 0, 0, 0, 1, 0, 0, 0, 1))
GLOBAL_VARP_INIT(const Matrixf3, Matrixf3_Null, (0, 0, 0, 0, 0, 0, 0, 0, 0, Null, Null, Null))

101
uppsrc/IconDes/IconDes.iml
View file

@ -17,6 +17,7 @@ IMAGE_ID(Move)
IMAGE_ID(MoveCursor)
IMAGE_ID(MoveMove)
IMAGE_ID(MoveOk)
IMAGE_ID(Lines__UHD)
IMAGE_ID(Lines)
IMAGE_ID(FreeHand__UHD)
IMAGE_ID(FreeHand)
@ -297,47 +298,65 @@ IMAGE_DATA(198,24,51,243,1,142,58,203,22,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
IMAGE_END_DATA(704, 2)
IMAGE_BEGIN_DATA
IMAGE_DATA(120,156,237,153,75,142,219,48,12,134,9,180,155,162,155,65,55,131,162,23,40,124,137,222,160,59,239,231,40,115,158,236)
IMAGE_DATA(122,151,220,199,13,157,40,145,101,61,40,89,15,202,226,87,24,25,20,67,74,250,126,201,118,90,120,131,55,16,120,243)
IMAGE_DATA(9,176,152,215,145,218,152,30,190,122,74,143,222,235,67,61,40,245,174,30,212,218,106,224,205,224,11,124,53,254,118,158)
IMAGE_DATA(111,115,93,238,159,41,96,173,186,82,72,29,95,175,51,63,41,232,243,54,47,192,30,230,39,113,252,105,173,185,92,46)
IMAGE_DATA(139,254,73,92,191,26,111,65,244,79,218,58,94,227,209,235,55,227,239,234,180,122,117,249,252,58,235,145,235,245,26,152)
IMAGE_DATA(139,191,62,188,150,215,239,185,56,82,79,153,63,254,142,139,121,158,67,254,102,252,157,196,185,7,215,176,169,255,1,239)
IMAGE_DATA(240,13,190,19,250,221,39,6,180,13,16,170,93,5,105,34,99,122,62,229,130,177,33,136,225,60,251,152,181,182,159,25)
IMAGE_DATA(246,9,185,34,245,33,184,34,247,177,204,77,159,95,82,31,53,63,237,176,36,245,81,123,69,223,107,9,125,54,7,114)
IMAGE_DATA(154,166,212,62,160,207,9,111,210,190,131,30,232,227,189,73,80,122,234,89,251,110,88,17,125,146,231,100,217,135,209,115)
IMAGE_DATA(114,236,231,232,57,121,110,208,81,115,178,204,37,122,78,71,31,54,136,218,103,142,53,109,230,228,234,101,156,197,16,155)
IMAGE_DATA(123,189,229,218,246,136,124,8,9,253,96,110,132,67,47,13,198,129,112,245,180,62,132,136,47,13,122,157,109,227,239,106)
IMAGE_DATA(41,61,229,33,228,238,169,231,38,15,161,23,242,16,178,207,163,216,67,232,23,252,172,245,77,40,182,255,145,111,75,20)
IMAGE_DATA(114,125,163,34,141,101,246,183,253,124,226,177,114,100,71,26,43,83,118,228,177,34,125,90,31,210,165,198,82,46,14,126)
IMAGE_DATA(155,116,177,59,171,134,251,92,99,205,183,63,11,252,123,121,203,248,66,176,31,231,114,187,102,251,75,212,193,151,134,237)
IMAGE_DATA(56,215,199,149,233,33,110,25,107,59,206,108,61,127,185,94,62,238,99,44,206,113,72,107,123,244,92,29,163,107,203,88)
IMAGE_DATA(247,53,45,86,119,38,225,127,142,188,220,251,76,243,100,62,107,94,123,193,191,38,210,218,112,45,56,134,145,57,94,127)
IMAGE_DATA(55,227,132,215,68,90,219,186,14,229,105,210,198,83,25,237,247,184,143,96,110,171,75,181,54,53,94,252,56,113,107,83)
IMAGE_DATA(107,81,127,226,199,121,174,205,247,226,181,174,101,210,198,161,103,100,29,15,194,47,103,71,220,197,82,107,28,0,239,127)
IMAGE_DATA(39,89,96,240,159,247,127,32,61,104,85,155,82,175,106,83,198,215,107,33,178,222,172,141,169,183,213,82,235,93,181,174)
IMAGE_DATA(122,221,171,175,150,82,239,171,165,212,135,208,199,241,93,165,235,205,191,139,157,127,171,250,149,223,31,240,65,29,236,209)
IMAGE_DATA(248,115,201,127,9,1,140,13,89,34,3,201,193,131,229,166,32,254,43,226,184,49,75,6,149,88,157,35,224,124,56,74)
IMAGE_DATA(6,5,121,250,247,103,16,66,50,72,100,227,95,50,168,206,206,127,157,12,132,7,86,255,146,65,53,156,254,141,12,34)
IMAGE_DATA(145,12,136,120,253,151,207,96,120,98,252,23,60,7,195,102,17,244,95,231,89,32,254,121,100,48,92,14,100,255,117,51)
IMAGE_DATA(24,38,155,40,255,199,50,80,72,22,26,209,254,143,103,144,203,255,41,114,73,242,159,231,28,40,134,206,34,217,127,222)
IMAGE_DATA(12,144,210,231,130,101,30,135,252,247,115,14,216,102,113,216,127,254,115,160,24,34,131,44,254,203,101,96,114,186,28,178)
IMAGE_DATA(249,175,151,129,141,110,51,200,234,191,109,6,138,174,50,200,238,159,71,6,58,227,249,55,50,96,192,208,254,153,100,128)
IMAGE_DATA(176,203,160,152,255,126,51,168,74,81,255,125,102,80,149,226,254,121,102,192,230,12,84,241,207,47,131,241,252,247,149,65)
IMAGE_DATA(53,170,250,231,149,193,152,254,251,201,160,74,14,77,252,243,201,96,92,255,124,50,64,154,101,208,212,63,159,12,154,157)
IMAGE_DATA(131,230,254,121,100,48,182,127,4,154,102,32,254,17,24,47,3,86,254,17,104,150,129,248,71,128,237,25,40,2,59,255)
IMAGE_DATA(8,176,60,3,69,96,233,31,129,38,25,136,127,29,168,154,129,220,255,109,64,149,12,66,238,199,245,143,64,241,12,228)
IMAGE_DATA(253,63,4,20,203,160,217,222,71,138,251,135,173,183,156,87,38,154,185,71,138,250,135,114,238,51,101,208,116,239,35,181)
IMAGE_DATA(247,63,51,154,186,71,146,253,199,212,130,248,119,113,216,63,165,30,186,244,95,133,36,255,96,185,23,247,151,65,243,189)
IMAGE_DATA(143,68,251,135,253,253,92,252,167,19,229,31,246,238,1,136,103,192,82,215,152,230,238,145,148,103,168,57,191,78,239,65)
IMAGE_DATA(253,248,7,183,251,212,62,12,232,195,63,132,221,147,250,240,203,128,191,127,160,185,39,245,234,203,127,251,231,47,196,185)
IMAGE_DATA(247,246,18,255,78,172,206,32,222,189,179,87,191,25,84,97,231,12,210,220,59,251,137,127,47,27,95,112,204,253,174,31)
IMAGE_DATA(193,127,227,12,248,248,135,60,62,58,187,7,53,127,6,152,123,49,199,152,29,221,131,66,254,139,103,80,226,94,112,178)
IMAGE_DATA(51,80,237,28,228,236,117,50,255,85,159,9,57,232,40,3,241,15,221,156,129,174,56,209,187,168,248,175,195,120,254,249)
IMAGE_DATA(220,131,20,167,241,143,116,154,129,162,91,239,138,206,253,119,15,217,191,100,80,12,57,3,109,17,255,109,73,241,47,25)
IMAGE_DATA(228,165,195,239,2,167,66,206,64,123,130,25,192,214,189,248,207,139,213,63,236,157,139,247,50,60,253,131,221,185,120,47)
IMAGE_DATA(143,56,111,139,56,23,4,65,16,4,65,16,4,65,16,132,147,242,31,153,8,134,55,0,0,0,0,0,0,0,0,0)
IMAGE_END_DATA(1280, 7)
IMAGE_DATA(120,156,237,153,75,110,219,48,16,134,9,180,155,162,155,160,155,162,232,5,10,29,166,59,237,115,148,156,199,187,222,197)
IMAGE_DATA(247,81,77,59,180,41,138,26,14,95,26,146,250,191,128,80,80,120,30,252,68,137,116,170,222,212,155,2,109,243,161,212)
IMAGE_DATA(226,142,156,216,152,28,84,60,39,71,239,241,161,28,156,248,189,28,220,216,195,208,47,131,47,234,171,243,175,243,124,235)
IMAGE_DATA(117,121,92,83,208,177,102,164,144,90,223,142,115,175,28,236,190,221,161,116,14,247,202,172,63,221,99,46,151,203,98,95)
IMAGE_DATA(153,243,55,245,22,141,125,229,205,227,85,143,31,191,170,191,137,179,226,205,160,252,238,198,107,174,215,107,160,23,58,62)
IMAGE_DATA(60,151,215,231,246,200,137,231,244,175,63,179,199,60,207,33,127,179,254,76,98,239,193,57,172,226,127,168,159,234,155,250)
IMAGE_DATA(206,200,247,104,76,241,22,64,40,246,46,200,18,25,147,243,41,87,57,11,130,121,115,158,121,220,88,223,239,13,230,9)
IMAGE_DATA(185,98,229,97,184,98,231,241,244,102,247,151,148,199,244,103,61,44,73,121,204,90,177,215,90,66,158,213,3,57,77,83)
IMAGE_DATA(106,30,101,247,164,95,210,212,131,30,200,67,190,36,56,57,237,123,77,189,176,34,242,36,247,228,89,135,209,61,237,172)
IMAGE_DATA(231,232,158,136,23,116,84,79,158,94,162,123,202,221,108,52,102,157,237,204,105,213,211,94,46,231,89,12,177,122,215,123)
IMAGE_DATA(198,58,71,228,38,4,250,193,93,8,89,135,6,231,129,216,203,233,221,132,152,135,6,59,206,183,240,55,177,156,156,216)
IMAGE_DATA(132,246,115,218,247,13,155,208,11,108,66,254,62,170,109,66,191,213,175,163,190,9,197,230,207,249,182,196,161,212,55,42)
IMAGE_DATA(86,45,55,191,239,247,129,107,149,184,119,172,90,133,238,29,187,86,164,79,239,38,93,171,150,113,145,249,109,114,143,205)
IMAGE_DATA(179,234,184,47,85,107,190,253,44,234,223,203,91,193,3,193,182,206,229,54,102,255,33,42,243,208,176,174,115,253,28,133)
IMAGE_DATA(54,113,79,173,117,157,217,251,252,149,58,124,60,106,44,187,117,88,115,251,204,121,119,172,93,123,106,61,230,180,120,221)
IMAGE_DATA(185,132,255,28,121,121,228,153,230,201,221,107,94,107,129,158,19,107,110,122,46,186,134,115,207,245,248,187,170,19,158,19)
IMAGE_DATA(107,110,247,121,24,79,147,85,207,220,163,237,26,167,8,222,183,187,75,51,55,83,47,190,78,220,220,204,92,204,79,124)
IMAGE_DATA(157,231,220,168,131,215,125,46,147,85,135,127,143,188,245,84,248,112,150,227,46,150,163,234,40,69,254,119,210,150,63,239)
IMAGE_DATA(234,189,106,55,0,0,0,0,0,224,76,124,44,254,1,234,179,231,30,254,235,67,185,135,255,186,132,220,195,127,61,56)
IMAGE_DATA(238,225,191,14,92,247,240,95,158,24,247,240,95,150,88,247,240,95,142,20,247,240,95,134,84,247,240,159,79,142,123,248)
IMAGE_DATA(207,35,215,61,252,167,19,235,24,254,203,145,178,190,225,191,12,169,239,22,248,207,39,231,189,14,255,121,228,238,169,240)
IMAGE_DATA(159,78,137,243,12,252,167,81,234,44,9,255,241,148,114,79,229,2,126,74,186,167,242,129,45,165,221,83,57,193,154,26)
IMAGE_DATA(238,169,188,224,69,45,247,84,110,240,160,166,123,42,63,168,239,158,170,113,118,142,112,79,213,57,51,71,185,167,106,157)
IMAGE_DATA(149,35,221,83,245,206,200,209,238,169,154,103,67,194,61,85,247,76,72,185,167,106,159,5,73,247,84,253,51,32,237,158)
IMAGE_DATA(234,97,116,90,112,79,245,49,50,173,184,167,122,25,149,150,220,83,253,140,72,107,238,169,158,70,163,69,247,84,95,35)
IMAGE_DATA(209,170,123,170,183,81,104,217,61,213,223,8,180,238,158,234,177,58,75,228,136,164,7,247,84,159,213,169,232,191,23,247)
IMAGE_DATA(84,175,213,169,228,191,39,247,154,145,252,247,230,94,51,138,255,30,221,107,70,240,223,171,123,77,239,254,123,118,175,57)
IMAGE_DATA(139,255,86,57,131,255,150,25,221,127,235,140,236,191,7,70,245,223,11,189,251,239,29,248,151,5,254,101,129,127,89,224)
IMAGE_DATA(95,22,248,151,37,218,127,172,183,214,70,99,192,191,44,240,47,11,252,203,2,255,178,192,191,44,240,47,11,252,203,2)
IMAGE_DATA(255,178,192,191,44,240,47,11,252,203,18,237,191,20,157,123,43,5,252,203,2,255,178,192,191,44,240,47,11,252,203,2)
IMAGE_DATA(255,178,192,191,44,240,47,11,252,203,2,255,178,192,191,44,240,127,82,224,95,22,248,151,5,254,101,129,127,89,224,63)
IMAGE_DATA(129,255,164,8,49,161,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
IMAGE_END_DATA(1024, 6)
IMAGE_BEGIN_DATA
IMAGE_DATA(120,156,237,151,91,78,236,48,16,5,207,18,88,6,187,184,91,97,41,236,28,174,17,65,153,196,142,31,113,191,226,83)
IMAGE_DATA(210,252,32,181,7,85,165,29,192,27,222,96,204,191,255,159,175,155,179,35,243,219,236,200,247,239,103,209,57,127,156,237)
IMAGE_DATA(153,207,205,182,206,151,102,75,243,123,175,87,179,45,243,87,179,45,243,53,246,223,115,245,145,158,63,254,172,247,247,183)
IMAGE_DATA(154,255,225,253,3,31,173,95,246,123,240,231,215,252,15,169,112,120,32,37,26,176,195,5,153,75,129,254,21,41,92,204)
IMAGE_DATA(108,160,196,143,243,4,138,47,71,54,16,228,207,255,117,131,26,108,48,200,139,127,54,80,231,228,95,167,1,249,37,235)
IMAGE_DATA(159,13,212,40,250,63,52,232,132,13,26,185,244,47,223,96,121,122,252,11,238,193,178,45,170,254,117,222,5,244,239,163)
IMAGE_DATA(193,114,29,154,253,235,54,88,166,77,151,255,123,13,54,216,98,71,183,255,251,13,102,249,127,68,151,33,255,115,246,96)
IMAGE_DATA(99,233,22,195,254,231,54,72,72,239,133,203,30,183,252,199,217,3,183,45,110,251,159,191,7,27,75,52,152,226,95,174)
IMAGE_DATA(193,145,199,117,152,230,95,175,65,142,176,13,166,250,183,109,176,17,170,193,116,255,62,26,236,89,207,255,161,129,3,150)
IMAGE_DATA(246,239,164,65,194,93,3,49,255,113,27,168,34,234,63,102,3,85,196,253,251,108,224,102,7,84,252,251,107,176,158,255)
IMAGE_DATA(88,13,212,80,245,239,171,193,154,254,227,52,80,233,96,226,223,79,131,117,253,251,105,144,48,107,96,234,223,79,3,179)
IMAGE_DATA(61,48,247,239,163,193,218,254,19,48,109,64,255,9,172,215,192,149,255,4,204,26,208,127,2,110,119,64,4,119,254,19)
IMAGE_DATA(112,185,3,34,184,244,159,128,73,3,250,223,3,213,6,188,255,115,64,165,65,205,253,186,254,19,16,111,192,191,255,107)
IMAGE_DATA(64,172,129,217,179,159,16,247,143,87,111,51,63,147,48,115,159,16,245,15,57,247,147,26,152,62,251,9,237,231,223,25)
IMAGE_DATA(166,238,19,195,254,123,102,65,255,37,110,251,111,153,71,72,255,42,12,249,71,230,46,142,215,192,252,217,79,116,251,199)
IMAGE_DATA(249,62,167,255,113,186,252,227,236,30,104,220,129,204,156,49,230,238,19,35,239,208,227,239,23,244,14,138,227,31,101,247)
IMAGE_DATA(163,231,56,32,134,127,212,221,55,157,227,175,129,127,255,104,115,223,116,86,44,255,246,239,95,244,185,191,60,139,254,139)
IMAGE_DATA(100,157,161,223,125,241,172,184,13,84,56,57,195,152,251,226,121,244,127,201,139,47,220,115,127,58,175,193,191,113,3,63)
IMAGE_DATA(254,49,199,71,176,59,200,252,29,112,124,22,103,124,103,160,59,168,230,95,188,129,196,93,240,176,29,80,219,131,153,103)
IMAGE_DATA(61,204,191,234,59,97,6,129,26,208,63,194,236,64,40,30,244,183,40,253,235,176,158,127,63,119,208,198,99,252,39,130)
IMAGE_DATA(54,216,8,235,125,35,184,255,240,52,251,103,3,49,184,3,182,208,191,45,35,254,217,96,46,1,255,23,120,20,220,1)
IMAGE_DATA(123,170,13,240,234,158,254,231,146,245,143,179,115,122,151,225,207,63,242,206,233,93,30,58,183,133,206,9,33,132,16,66)
IMAGE_DATA(8,33,132,144,135,242,13,138,190,51,172,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0)
IMAGE_END_DATA(736, 2)
IMAGE_BEGIN_DATA
IMAGE_DATA(120,156,237,157,11,120,85,213,149,199,119,18,156,182,116,74,157,105,29,208,170,72,193,214,10,117,36,173,138,15,72,5)