Переглянути джерело

win64: various VS 2015 build fixes.

undefined
Sam Hocevar 8 роки тому
джерело
коміт
3db14cd669
8 змінених файлів з 31 додано та 799 видалено
  1. +0
    -787
      build/Lol (vs2013).sln
  2. +1
    -1
      src/lol/base/string.h
  3. +4
    -0
      src/lol/math/matrix.h
  4. +10
    -10
      src/lol/math/ops.h
  5. +8
    -0
      src/lol/math/polynomial.h
  6. +2
    -0
      src/lol/math/transform.h
  7. +5
    -0
      src/lol/math/vector.h
  8. +1
    -1
      src/lolua/baselua.h

+ 0
- 787
build/Lol (vs2013).sln Переглянути файл

@@ -1,787 +0,0 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "deushax", "..\games\deushax\deushax.vcxproj", "{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "monsterz", "..\games\monsterz\monsterz.vcxproj", "{17F0F184-4436-4D08-B8AA-16572EA238DB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "editor", "..\games\deushax\editor.vcxproj", "{9C66B179-0737-4BDA-AB42-2ADE478A9008}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Deus Hax", "Deus Hax", "{08C6A854-533D-4A1E-924E-C4A62281869F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Monsterz", "Monsterz", "{2F87CEAB-4818-443C-A5E3-6C34E7D967EC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolcore", "..\src\lolcore.vcxproj", "{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolbullet", "..\src\bullet\lolbullet.vcxproj", "{83D3B207-C601-4025-8F41-01DEDC354661}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lollua", "..\src\lua\lollua.vcxproj", "{D84021CA-B233-4E0F-8A52-071B83BBCCC4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-base", "..\src\t\test-base.vcxproj", "{8F59A635-0240-4D7F-A80D-050C3F1670C2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-math", "..\src\t\test-math.vcxproj", "{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-sys", "..\src\t\test-sys.vcxproj", "{1782F849-B6E1-466D-9F02-A751F3F8712C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-image", "..\src\t\test-image.vcxproj", "{5A27FF18-A1EC-49BE-9455-415F1C701153}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-entity", "..\src\t\test-entity.vcxproj", "{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "..\doc\samples\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorial", "Tutorial", "{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "..\doc\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "..\doc\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05_easymesh", "..\doc\tutorial\05_easymesh.vcxproj", "{1C5B8702-290C-42DA-AA9E-671348F5B747}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "11_fractal", "..\doc\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MrPigeon", "MrPigeon", "{33704AA4-F2B5-4138-A40D-E3E77F89ED46}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mrpigeon", "..\games\mrpigeon\mrpigeon.vcxproj", "{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Games", "Games", "{1DFE1729-4F1B-47CA-9819-72431FE14E25}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Orbital", "Orbital", "{8C77EAA8-1077-4EF7-AE53-97C6C60A3601}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "orbital", "..\games\orbital\orbital.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F40FECB52}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "- Engine -", "- Engine -", "{1AFD580B-98B8-4689-B661-38C41132C60E}"
ProjectSection(SolutionItems) = preProject
msbuild\config-build.xml = msbuild\config-build.xml
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{3D341D8A-E400-4B1D-BC05-B5C35487D9B5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Neercs", "Neercs", "{B357514A-7881-422D-8358-161B689E7620}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "neercs", "..\tools\neercs\neercs.vcxproj", "{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Touky", "Touky", "{9EA99B18-D352-47F6-BC04-A0B49CAA2772}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touky_demo", "..\people\touky\touky_demo\touky_demo.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F43FECB52}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "..\doc\samples\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "..\doc\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Jnat", "Jnat", "{0A1651FC-322B-4B04-82CB-28E9046D9383}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo-jnat", "..\people\jnat\demo-jnat.vcxproj", "{A69411B3-6DE8-404E-8E70-0D3375A7492A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sam", "Sam", "{928A359C-9C41-400A-8D2D-A054B33A79F5}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "People", "People", "{5F1AAF03-7202-4C07-B99F-EB397105B1B7}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Peeweek", "Peeweek", "{E27FDF36-50C4-4ED2-8CF5-A20FED016910}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo-peeweek", "..\people\peeweek\demo-peeweek.vcxproj", "{C2E01551-B636-4324-8461-71811DF6FBB5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03_noise", "..\doc\tutorial\03_noise.vcxproj", "{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestProject", "..\people\jnat\TestProject\TestProject.vcxproj", "{5A77DCDD-2CBA-43E9-8B45-00C281443F77}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04_texture", "..\doc\tutorial\04_texture.vcxproj", "{834852DB-EDB6-4FD0-BCF9-45CD01126962}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benlitz", "Benlitz", "{B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benlitzTest1", "..\people\benlitz\test1\benlitzTest1.vcxproj", "{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\doc\samples\meshviewer\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tactics", "..\people\touky\tactics\tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "12_Voronoi", "..\doc\tutorial\12_Voronoi.vcxproj", "{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "the_unfortunate_voronoid", "..\people\touky\the_unfortunate_voronoid\the_unfortunate_voronoid.vcxproj", "{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol.js", "..\demos\lol.js\lol.js.vcxproj", "{AA376B9B-484B-4DC4-982F-6CFA645E441E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{E5C5E320-C077-4362-9A3F-3920C6447601}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lol.js", "Lol.js", "{F7D4A671-612F-4FF4-883F-2097697694B7}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "07_input", "..\doc\tutorial\07_input.vcxproj", "{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "06_sprite", "..\doc\tutorial\06_sprite.vcxproj", "{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "voxel", "..\people\benlitz\voxel\voxel.vcxproj", "{52493826-AC00-470B-A745-4F602529B3B0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Puzzle", "..\people\benlitz\puzzle\Puzzle.vcxproj", "{9F291982-8C81-4105-BF39-16844648E55F}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolui", "..\people\benlitz\lolui\lolui.vcxproj", "{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LD28 — SinglShot", "LD28 — SinglShot", "{50509BA3-D27B-4FAC-9772-9EC76146F709}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "singlshot", "..\games\singlshot\singlshot.vcxproj", "{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Jylam", "Jylam", "{454DE15C-9063-4EB1-AD6C-77D7150F15DF}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "chat", "..\people\jylam\private\chat\chat.vcxproj", "{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "workbench", "..\people\touky\workbench\workbench.vcxproj", "{EE203B88-44CF-4829-9D42-7A5F43FECB52}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sprite_sorter", "..\people\touky\sprite_sorter\sprite_sorter.vcxproj", "{7422B977-CA61-49BF-A586-F57B6FF9BD64}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "squad_shooter", "..\people\touky\squad_shooter\squad_shooter.vcxproj", "{DB344310-4938-4294-AEE2-18512454585D}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "The Pimp", "The Pimp", "{2195FB18-53BF-48AF-96B6-9BD242924EA5}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pimp", "..\tools\pimp\pimp.vcxproj", "{FFF58874-D460-41E6-AD65-DBFEC6E47A94}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit Test", "Unit Test", "{E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "top_shooter", "..\people\touky\top_shooter\top_shooter.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F45FEDB52}"
ProjectSection(ProjectDependencies) = postProject
{EE203B88-44CF-4859-9D42-7A4F43FEDB52} = {EE203B88-44CF-4859-9D42-7A4F43FEDB52}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "13_shader_builder", "..\doc\tutorial\13_shader_builder.vcxproj", "{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LolRemez", "LolRemez", "{4C4BD478-3767-4C27-BD91-DAAFE7CD03A2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lolremez", "..\tools\lolremez\lolremez.vcxproj", "{73F1A804-1116-46C3-922A-9C0ADEB33F52}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{B6297FF2-63D0-41EE-BE13-EFF720C9B0FA}"
ProjectSection(SolutionItems) = preProject
..\doc\samples\Makefile.am = ..\doc\samples\Makefile.am
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{65FD48E9-C936-4A23-AD46-BF738B6D4733}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shared", "..\people\touky\shared\shared.vcxproj", "{EE203B88-44CF-4859-9D42-7A4F43FEDB52}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "14_lol_lua", "..\doc\tutorial\14_lol_lua.vcxproj", "{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LD32 — Size-o-Tron 3000", "LD32 — Size-o-Tron 3000", "{65114D40-9450-4B2D-B051-7A75E97C88E1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sot3000", "..\games\sot3000\sot3000.vcxproj", "{B9A255A0-2B92-4801-AF6C-354535A6E105}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LD33 — Grunx", "LD33 — Grunx", "{CE356481-3D75-425A-9970-766340FB88FC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "grunx", "..\games\grunx\grunx.vcxproj", "{775B46F7-03C4-4351-B78D-76088E028D14}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LD34 — Wesh Grow", "LD34 — Wesh Grow", "{3961536A-EF8C-4CC2-9E9C-1E5AF91288E3}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "weshgrow", "..\games\weshgrow\weshgrow.vcxproj", "{010BF56B-2D3A-4EBE-839C-0B734EB368CA}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LD35 — All Turd Beast", "LD35 — All Turd Beast", "{248073F0-AEF0-4776-88E2-50F1D09D9E87}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "allturdbeast", "..\games\allturdbeast\allturdbeast.vcxproj", "{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ORBIS = Debug|ORBIS
Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
Release|ORBIS = Release|ORBIS
Release|Win32 = Release|Win32
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|ORBIS.Build.0 = Debug|ORBIS
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.ActiveCfg = Debug|Win32
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|Win32.Build.0 = Debug|Win32
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|x64.ActiveCfg = Debug|x64
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Debug|x64.Build.0 = Debug|x64
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|ORBIS.ActiveCfg = Release|ORBIS
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|ORBIS.Build.0 = Release|ORBIS
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Win32.ActiveCfg = Release|Win32
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|Win32.Build.0 = Release|Win32
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|x64.ActiveCfg = Release|x64
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C}.Release|x64.Build.0 = Release|x64
{17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|ORBIS.ActiveCfg = Debug|Win32
{17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|Win32.ActiveCfg = Debug|Win32
{17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|x64.ActiveCfg = Debug|x64
{17F0F184-4436-4D08-B8AA-16572EA238DB}.Debug|x64.Build.0 = Debug|x64
{17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|ORBIS.ActiveCfg = Release|Win32
{17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.ActiveCfg = Release|Win32
{17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|Win32.Build.0 = Release|Win32
{17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|x64.ActiveCfg = Release|x64
{17F0F184-4436-4D08-B8AA-16572EA238DB}.Release|x64.Build.0 = Release|x64
{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.ActiveCfg = Debug|Win32
{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|Win32.Build.0 = Debug|Win32
{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Debug|x64.ActiveCfg = Debug|x64
{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|ORBIS.ActiveCfg = Release|ORBIS
{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.ActiveCfg = Release|Win32
{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|Win32.Build.0 = Release|Win32
{9C66B179-0737-4BDA-AB42-2ADE478A9008}.Release|x64.ActiveCfg = Release|x64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|ORBIS.ActiveCfg = Debug|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.ActiveCfg = Debug|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|Win32.Build.0 = Debug|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|x64.ActiveCfg = Debug|x64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Debug|x64.Build.0 = Debug|x64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|ORBIS.ActiveCfg = Release|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.ActiveCfg = Release|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|Win32.Build.0 = Release|Win32
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|x64.ActiveCfg = Release|x64
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA}.Release|x64.Build.0 = Release|x64
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|ORBIS.ActiveCfg = Debug|Win32
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win32.ActiveCfg = Debug|Win32
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|Win32.Build.0 = Debug|Win32
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|x64.ActiveCfg = Debug|x64
{83D3B207-C601-4025-8F41-01DEDC354661}.Debug|x64.Build.0 = Debug|x64
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|ORBIS.ActiveCfg = Release|Win32
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win32.ActiveCfg = Release|Win32
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|Win32.Build.0 = Release|Win32
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|x64.ActiveCfg = Release|x64
{83D3B207-C601-4025-8F41-01DEDC354661}.Release|x64.Build.0 = Release|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|ORBIS.ActiveCfg = Debug|Win32
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win32.ActiveCfg = Debug|Win32
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|Win32.Build.0 = Debug|Win32
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|x64.ActiveCfg = Debug|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Debug|x64.Build.0 = Debug|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|ORBIS.ActiveCfg = Release|Win32
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.ActiveCfg = Release|Win32
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Win32.Build.0 = Release|Win32
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.ActiveCfg = Release|x64
{D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.Build.0 = Release|x64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.ActiveCfg = Debug|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.ActiveCfg = Debug|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Win32.Build.0 = Debug|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.ActiveCfg = Debug|x64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|x64.Build.0 = Debug|x64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.ActiveCfg = Release|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.ActiveCfg = Release|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Win32.Build.0 = Release|Win32
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.ActiveCfg = Release|x64
{8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|x64.Build.0 = Release|x64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.ActiveCfg = Debug|Win32
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.ActiveCfg = Debug|Win32
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Win32.Build.0 = Debug|Win32
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.ActiveCfg = Debug|x64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|x64.Build.0 = Debug|x64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.ActiveCfg = Release|Win32
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.ActiveCfg = Release|Win32
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Win32.Build.0 = Release|Win32
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.ActiveCfg = Release|x64
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|x64.Build.0 = Release|x64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.ActiveCfg = Debug|Win32
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.ActiveCfg = Debug|Win32
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Win32.Build.0 = Debug|Win32
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.ActiveCfg = Debug|x64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|x64.Build.0 = Debug|x64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.ActiveCfg = Release|Win32
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.ActiveCfg = Release|Win32
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Win32.Build.0 = Release|Win32
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.ActiveCfg = Release|x64
{1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|x64.Build.0 = Release|x64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.ActiveCfg = Debug|Win32
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.ActiveCfg = Debug|Win32
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Win32.Build.0 = Debug|Win32
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.ActiveCfg = Debug|x64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|x64.Build.0 = Debug|x64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.ActiveCfg = Release|Win32
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.ActiveCfg = Release|Win32
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Win32.Build.0 = Release|Win32
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.ActiveCfg = Release|x64
{5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|x64.Build.0 = Release|x64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.ActiveCfg = Debug|Win32
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.ActiveCfg = Debug|Win32
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Win32.Build.0 = Debug|Win32
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.ActiveCfg = Debug|x64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|x64.Build.0 = Debug|x64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.ActiveCfg = Release|Win32
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.ActiveCfg = Release|Win32
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Win32.Build.0 = Release|Win32
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.ActiveCfg = Release|x64
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|x64.Build.0 = Release|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|ORBIS.ActiveCfg = Debug|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|Win32.ActiveCfg = Debug|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.ActiveCfg = Debug|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Debug|x64.Build.0 = Debug|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|ORBIS.ActiveCfg = Release|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.ActiveCfg = Release|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|Win32.Build.0 = Release|Win32
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.ActiveCfg = Release|x64
{B1E10086-A1DA-401A-834D-969C9DBB5CC1}.Release|x64.Build.0 = Release|x64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|ORBIS.ActiveCfg = Debug|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|Win32.ActiveCfg = Debug|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.ActiveCfg = Debug|x64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Debug|x64.Build.0 = Debug|x64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|ORBIS.ActiveCfg = Release|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.ActiveCfg = Release|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|Win32.Build.0 = Release|Win32
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.ActiveCfg = Release|x64
{B92ABADC-45BE-4CC5-B724-9426053123A1}.Release|x64.Build.0 = Release|x64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|ORBIS.ActiveCfg = Debug|Win32
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|Win32.ActiveCfg = Debug|Win32
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.ActiveCfg = Debug|x64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Debug|x64.Build.0 = Debug|x64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|ORBIS.ActiveCfg = Release|Win32
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.ActiveCfg = Release|Win32
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|Win32.Build.0 = Release|Win32
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.ActiveCfg = Release|x64
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}.Release|x64.Build.0 = Release|x64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|ORBIS.ActiveCfg = Debug|Win32
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|Win32.ActiveCfg = Debug|Win32
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.ActiveCfg = Debug|x64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Debug|x64.Build.0 = Debug|x64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|ORBIS.ActiveCfg = Release|Win32
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.ActiveCfg = Release|Win32
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|Win32.Build.0 = Release|Win32
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.ActiveCfg = Release|x64
{1C5B8702-290C-42DA-AA9E-671348F5B747}.Release|x64.Build.0 = Release|x64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64
{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|ORBIS.ActiveCfg = Debug|Win32
{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|Win32.ActiveCfg = Debug|Win32
{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|x64.ActiveCfg = Debug|x64
{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Debug|x64.Build.0 = Debug|x64
{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|ORBIS.ActiveCfg = Release|Win32
{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Win32.ActiveCfg = Release|Win32
{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|Win32.Build.0 = Release|Win32
{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|x64.ActiveCfg = Release|x64
{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515}.Release|x64.Build.0 = Release|x64
{EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32
{EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|Win32.ActiveCfg = Debug|Win32
{EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|x64.ActiveCfg = Debug|x64
{EE203B88-44CF-4859-9D42-7A5F40FECB52}.Debug|x64.Build.0 = Debug|x64
{EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|ORBIS.ActiveCfg = Release|Win32
{EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Win32.ActiveCfg = Release|Win32
{EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|Win32.Build.0 = Release|Win32
{EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|x64.ActiveCfg = Release|x64
{EE203B88-44CF-4859-9D42-7A5F40FECB52}.Release|x64.Build.0 = Release|x64
{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|ORBIS.ActiveCfg = Debug|Win32
{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|Win32.ActiveCfg = Debug|Win32
{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|x64.ActiveCfg = Debug|x64
{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Debug|x64.Build.0 = Debug|x64
{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|ORBIS.ActiveCfg = Release|Win32
{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Win32.ActiveCfg = Release|Win32
{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|Win32.Build.0 = Release|Win32
{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|x64.ActiveCfg = Release|x64
{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233}.Release|x64.Build.0 = Release|x64
{EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32
{EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|Win32.ActiveCfg = Debug|Win32
{EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|x64.ActiveCfg = Debug|x64
{EE203B88-44CF-4859-9D42-7A5F43FECB52}.Debug|x64.Build.0 = Debug|x64
{EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|ORBIS.ActiveCfg = Release|Win32
{EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Win32.ActiveCfg = Release|Win32
{EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|Win32.Build.0 = Release|Win32
{EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|x64.ActiveCfg = Release|x64
{EE203B88-44CF-4859-9D42-7A5F43FECB52}.Release|x64.Build.0 = Release|x64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|Win32.ActiveCfg = Debug|Win32
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.ActiveCfg = Debug|x64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Debug|x64.Build.0 = Debug|x64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|ORBIS.ActiveCfg = Release|Win32
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win32.ActiveCfg = Release|Win32
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|Win32.Build.0 = Release|Win32
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.ActiveCfg = Release|x64
{EE203B88-44CF-4859-9D42-7A1F43FECB52}.Release|x64.Build.0 = Release|x64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|ORBIS.ActiveCfg = Debug|Win32
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|Win32.ActiveCfg = Debug|Win32
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|x64.ActiveCfg = Debug|x64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Debug|x64.Build.0 = Debug|x64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|ORBIS.ActiveCfg = Release|Win32
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win32.ActiveCfg = Release|Win32
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|Win32.Build.0 = Release|Win32
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|x64.ActiveCfg = Release|x64
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}.Release|x64.Build.0 = Release|x64
{A69411B3-6DE8-404E-8E70-0D3375A7492A}.Debug|ORBIS.ActiveCfg = Debug|Win32
{A69411B3-6DE8-404E-8E70-0D3375A7492A}.Debug|Win32.ActiveCfg = Debug|Win32
{A69411B3-6DE8-404E-8E70-0D3375A7492A}.Debug|x64.ActiveCfg = Debug|x64
{A69411B3-6DE8-404E-8E70-0D3375A7492A}.Debug|x64.Build.0 = Debug|x64
{A69411B3-6DE8-404E-8E70-0D3375A7492A}.Release|ORBIS.ActiveCfg = Release|Win32
{A69411B3-6DE8-404E-8E70-0D3375A7492A}.Release|Win32.ActiveCfg = Release|Win32
{A69411B3-6DE8-404E-8E70-0D3375A7492A}.Release|Win32.Build.0 = Release|Win32
{A69411B3-6DE8-404E-8E70-0D3375A7492A}.Release|x64.ActiveCfg = Release|x64
{A69411B3-6DE8-404E-8E70-0D3375A7492A}.Release|x64.Build.0 = Release|x64
{C2E01551-B636-4324-8461-71811DF6FBB5}.Debug|ORBIS.ActiveCfg = Debug|Win32
{C2E01551-B636-4324-8461-71811DF6FBB5}.Debug|Win32.ActiveCfg = Debug|Win32
{C2E01551-B636-4324-8461-71811DF6FBB5}.Debug|x64.ActiveCfg = Debug|x64
{C2E01551-B636-4324-8461-71811DF6FBB5}.Debug|x64.Build.0 = Debug|x64
{C2E01551-B636-4324-8461-71811DF6FBB5}.Release|ORBIS.ActiveCfg = Release|Win32
{C2E01551-B636-4324-8461-71811DF6FBB5}.Release|Win32.ActiveCfg = Release|Win32
{C2E01551-B636-4324-8461-71811DF6FBB5}.Release|Win32.Build.0 = Release|Win32
{C2E01551-B636-4324-8461-71811DF6FBB5}.Release|x64.ActiveCfg = Release|x64
{C2E01551-B636-4324-8461-71811DF6FBB5}.Release|x64.Build.0 = Release|x64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|ORBIS.ActiveCfg = Debug|Win32
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win32.ActiveCfg = Debug|Win32
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|x64.ActiveCfg = Debug|x64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|x64.Build.0 = Debug|x64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|ORBIS.ActiveCfg = Release|Win32
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win32.ActiveCfg = Release|Win32
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Win32.Build.0 = Release|Win32
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|x64.ActiveCfg = Release|x64
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|x64.Build.0 = Release|x64
{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|ORBIS.ActiveCfg = Debug|Win32
{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|Win32.ActiveCfg = Debug|Win32
{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|x64.ActiveCfg = Debug|x64
{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Debug|x64.Build.0 = Debug|x64
{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|ORBIS.ActiveCfg = Release|Win32
{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Win32.ActiveCfg = Release|Win32
{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|Win32.Build.0 = Release|Win32
{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|x64.ActiveCfg = Release|x64
{5A77DCDD-2CBA-43E9-8B45-00C281443F77}.Release|x64.Build.0 = Release|x64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|ORBIS.ActiveCfg = Debug|Win32
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|Win32.ActiveCfg = Debug|Win32
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.ActiveCfg = Debug|x64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Debug|x64.Build.0 = Debug|x64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|ORBIS.ActiveCfg = Release|Win32
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.ActiveCfg = Release|Win32
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|Win32.Build.0 = Release|Win32
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.ActiveCfg = Release|x64
{834852DB-EDB6-4FD0-BCF9-45CD01126962}.Release|x64.Build.0 = Release|x64
{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Debug|ORBIS.ActiveCfg = Debug|Win32
{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Debug|Win32.ActiveCfg = Debug|Win32
{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Debug|x64.ActiveCfg = Debug|x64
{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Debug|x64.Build.0 = Debug|x64
{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|ORBIS.ActiveCfg = Release|Win32
{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|Win32.ActiveCfg = Release|Win32
{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|Win32.Build.0 = Release|Win32
{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|x64.ActiveCfg = Release|x64
{FAF82AD2-D9F4-4694-9A01-103BC5B771B4}.Release|x64.Build.0 = Release|x64
{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|ORBIS.ActiveCfg = Debug|Win32
{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Win32.ActiveCfg = Debug|Win32
{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|Win32.Build.0 = Debug|Win32
{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|x64.ActiveCfg = Debug|x64
{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Debug|x64.Build.0 = Debug|x64
{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|ORBIS.ActiveCfg = Release|Win32
{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Win32.ActiveCfg = Release|Win32
{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|Win32.Build.0 = Release|Win32
{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|x64.ActiveCfg = Release|x64
{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}.Release|x64.Build.0 = Release|x64
{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|ORBIS.ActiveCfg = Debug|Win32
{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|Win32.ActiveCfg = Debug|Win32
{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|x64.ActiveCfg = Debug|x64
{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Debug|x64.Build.0 = Debug|x64
{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|ORBIS.ActiveCfg = Release|Win32
{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|Win32.ActiveCfg = Release|Win32
{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|Win32.Build.0 = Release|Win32
{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|x64.ActiveCfg = Release|x64
{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|x64.Build.0 = Release|x64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64
{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|ORBIS.ActiveCfg = Debug|Win32
{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32
{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|x64.ActiveCfg = Debug|x64
{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Debug|x64.Build.0 = Debug|x64
{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Release|ORBIS.ActiveCfg = Release|Win32
{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Release|Win32.ActiveCfg = Release|Win32
{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Release|Win32.Build.0 = Release|Win32
{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Release|x64.ActiveCfg = Release|x64
{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}.Release|x64.Build.0 = Release|x64
{AA376B9B-484B-4DC4-982F-6CFA645E441E}.Debug|ORBIS.ActiveCfg = Debug|Win32
{AA376B9B-484B-4DC4-982F-6CFA645E441E}.Debug|Win32.ActiveCfg = Debug|Win32
{AA376B9B-484B-4DC4-982F-6CFA645E441E}.Debug|x64.ActiveCfg = Debug|x64
{AA376B9B-484B-4DC4-982F-6CFA645E441E}.Debug|x64.Build.0 = Debug|x64
{AA376B9B-484B-4DC4-982F-6CFA645E441E}.Release|ORBIS.ActiveCfg = Release|Win32
{AA376B9B-484B-4DC4-982F-6CFA645E441E}.Release|Win32.ActiveCfg = Release|Win32
{AA376B9B-484B-4DC4-982F-6CFA645E441E}.Release|Win32.Build.0 = Release|Win32
{AA376B9B-484B-4DC4-982F-6CFA645E441E}.Release|x64.ActiveCfg = Release|x64
{AA376B9B-484B-4DC4-982F-6CFA645E441E}.Release|x64.Build.0 = Release|x64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|ORBIS.ActiveCfg = Debug|Win32
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|Win32.ActiveCfg = Debug|Win32
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|x64.ActiveCfg = Debug|x64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Debug|x64.Build.0 = Debug|x64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|ORBIS.ActiveCfg = Release|Win32
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win32.ActiveCfg = Release|Win32
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|Win32.Build.0 = Release|Win32
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|x64.ActiveCfg = Release|x64
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}.Release|x64.Build.0 = Release|x64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|ORBIS.ActiveCfg = Debug|Win32
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|Win32.ActiveCfg = Debug|Win32
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|x64.ActiveCfg = Debug|x64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Debug|x64.Build.0 = Debug|x64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|ORBIS.ActiveCfg = Release|Win32
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win32.ActiveCfg = Release|Win32
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|Win32.Build.0 = Release|Win32
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|x64.ActiveCfg = Release|x64
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}.Release|x64.Build.0 = Release|x64
{52493826-AC00-470B-A745-4F602529B3B0}.Debug|ORBIS.ActiveCfg = Debug|Win32
{52493826-AC00-470B-A745-4F602529B3B0}.Debug|Win32.ActiveCfg = Debug|Win32
{52493826-AC00-470B-A745-4F602529B3B0}.Debug|x64.ActiveCfg = Debug|x64
{52493826-AC00-470B-A745-4F602529B3B0}.Debug|x64.Build.0 = Debug|x64
{52493826-AC00-470B-A745-4F602529B3B0}.Release|ORBIS.ActiveCfg = Release|Win32
{52493826-AC00-470B-A745-4F602529B3B0}.Release|Win32.ActiveCfg = Release|Win32
{52493826-AC00-470B-A745-4F602529B3B0}.Release|Win32.Build.0 = Release|Win32
{52493826-AC00-470B-A745-4F602529B3B0}.Release|x64.ActiveCfg = Release|x64
{52493826-AC00-470B-A745-4F602529B3B0}.Release|x64.Build.0 = Release|x64
{9F291982-8C81-4105-BF39-16844648E55F}.Debug|ORBIS.ActiveCfg = Debug|Win32
{9F291982-8C81-4105-BF39-16844648E55F}.Debug|Win32.ActiveCfg = Debug|Win32
{9F291982-8C81-4105-BF39-16844648E55F}.Debug|x64.ActiveCfg = Debug|x64
{9F291982-8C81-4105-BF39-16844648E55F}.Debug|x64.Build.0 = Debug|x64
{9F291982-8C81-4105-BF39-16844648E55F}.Release|ORBIS.ActiveCfg = Release|Win32
{9F291982-8C81-4105-BF39-16844648E55F}.Release|Win32.ActiveCfg = Release|Win32
{9F291982-8C81-4105-BF39-16844648E55F}.Release|Win32.Build.0 = Release|Win32
{9F291982-8C81-4105-BF39-16844648E55F}.Release|x64.ActiveCfg = Release|x64
{9F291982-8C81-4105-BF39-16844648E55F}.Release|x64.Build.0 = Release|x64
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Debug|ORBIS.ActiveCfg = Debug|Win32
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Debug|Win32.ActiveCfg = Debug|Win32
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Debug|Win32.Build.0 = Debug|Win32
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Debug|x64.ActiveCfg = Debug|x64
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Debug|x64.Build.0 = Debug|x64
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|ORBIS.ActiveCfg = Release|Win32
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|Win32.ActiveCfg = Release|Win32
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|Win32.Build.0 = Release|Win32
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|x64.ActiveCfg = Release|x64
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F}.Release|x64.Build.0 = Release|x64
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|ORBIS.ActiveCfg = Debug|Win32
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|Win32.ActiveCfg = Debug|Win32
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|x64.ActiveCfg = Debug|x64
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Debug|x64.Build.0 = Debug|x64
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|ORBIS.ActiveCfg = Release|Win32
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|Win32.ActiveCfg = Release|Win32
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|Win32.Build.0 = Release|Win32
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|x64.ActiveCfg = Release|x64
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA}.Release|x64.Build.0 = Release|x64
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|ORBIS.Build.0 = Debug|ORBIS
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.ActiveCfg = Debug|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.Build.0 = Debug|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|Win32.Deploy.0 = Debug|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|x64.ActiveCfg = Debug|x64
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|x64.Build.0 = Debug|x64
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Debug|x64.Deploy.0 = Debug|x64
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|ORBIS.ActiveCfg = Release|ORBIS
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|ORBIS.Build.0 = Release|ORBIS
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.ActiveCfg = Release|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.Build.0 = Release|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|Win32.Deploy.0 = Release|Win32
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|x64.ActiveCfg = Release|x64
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|x64.Build.0 = Release|x64
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A}.Release|x64.Deploy.0 = Release|x64
{EE203B88-44CF-4829-9D42-7A5F43FECB52}.Debug|ORBIS.ActiveCfg = Debug|Win32
{EE203B88-44CF-4829-9D42-7A5F43FECB52}.Debug|Win32.ActiveCfg = Debug|Win32
{EE203B88-44CF-4829-9D42-7A5F43FECB52}.Debug|Win32.Build.0 = Debug|Win32
{EE203B88-44CF-4829-9D42-7A5F43FECB52}.Debug|x64.ActiveCfg = Debug|x64
{EE203B88-44CF-4829-9D42-7A5F43FECB52}.Debug|x64.Build.0 = Debug|x64
{EE203B88-44CF-4829-9D42-7A5F43FECB52}.Release|ORBIS.ActiveCfg = Release|Win32
{EE203B88-44CF-4829-9D42-7A5F43FECB52}.Release|Win32.ActiveCfg = Release|Win32
{EE203B88-44CF-4829-9D42-7A5F43FECB52}.Release|Win32.Build.0 = Release|Win32
{EE203B88-44CF-4829-9D42-7A5F43FECB52}.Release|x64.ActiveCfg = Release|x64
{EE203B88-44CF-4829-9D42-7A5F43FECB52}.Release|x64.Build.0 = Release|x64
{7422B977-CA61-49BF-A586-F57B6FF9BD64}.Debug|ORBIS.ActiveCfg = Debug|Win32
{7422B977-CA61-49BF-A586-F57B6FF9BD64}.Debug|Win32.ActiveCfg = Debug|Win32
{7422B977-CA61-49BF-A586-F57B6FF9BD64}.Debug|Win32.Build.0 = Debug|Win32
{7422B977-CA61-49BF-A586-F57B6FF9BD64}.Debug|x64.ActiveCfg = Debug|x64
{7422B977-CA61-49BF-A586-F57B6FF9BD64}.Debug|x64.Build.0 = Debug|x64
{7422B977-CA61-49BF-A586-F57B6FF9BD64}.Release|ORBIS.ActiveCfg = Release|Win32
{7422B977-CA61-49BF-A586-F57B6FF9BD64}.Release|Win32.ActiveCfg = Release|Win32
{7422B977-CA61-49BF-A586-F57B6FF9BD64}.Release|Win32.Build.0 = Release|Win32
{7422B977-CA61-49BF-A586-F57B6FF9BD64}.Release|x64.ActiveCfg = Release|x64
{7422B977-CA61-49BF-A586-F57B6FF9BD64}.Release|x64.Build.0 = Release|x64
{DB344310-4938-4294-AEE2-18512454585D}.Debug|ORBIS.ActiveCfg = Debug|Win32
{DB344310-4938-4294-AEE2-18512454585D}.Debug|Win32.ActiveCfg = Debug|Win32
{DB344310-4938-4294-AEE2-18512454585D}.Debug|Win32.Build.0 = Debug|Win32
{DB344310-4938-4294-AEE2-18512454585D}.Debug|x64.ActiveCfg = Debug|x64
{DB344310-4938-4294-AEE2-18512454585D}.Debug|x64.Build.0 = Debug|x64
{DB344310-4938-4294-AEE2-18512454585D}.Release|ORBIS.ActiveCfg = Release|Win32
{DB344310-4938-4294-AEE2-18512454585D}.Release|Win32.ActiveCfg = Release|Win32
{DB344310-4938-4294-AEE2-18512454585D}.Release|Win32.Build.0 = Release|Win32
{DB344310-4938-4294-AEE2-18512454585D}.Release|x64.ActiveCfg = Release|x64
{DB344310-4938-4294-AEE2-18512454585D}.Release|x64.Build.0 = Release|x64
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|ORBIS.ActiveCfg = Debug|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|Win32.ActiveCfg = Debug|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|Win32.Build.0 = Debug|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|Win32.Deploy.0 = Debug|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|x64.ActiveCfg = Debug|x64
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|x64.Build.0 = Debug|x64
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Debug|x64.Deploy.0 = Debug|x64
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|ORBIS.ActiveCfg = Release|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Win32.ActiveCfg = Release|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Win32.Build.0 = Release|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Win32.Deploy.0 = Release|Win32
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|x64.ActiveCfg = Release|x64
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|x64.Build.0 = Release|x64
{FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|x64.Deploy.0 = Release|x64
{EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Debug|ORBIS.ActiveCfg = Debug|Win32
{EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Debug|Win32.ActiveCfg = Debug|Win32
{EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Debug|Win32.Build.0 = Debug|Win32
{EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Debug|x64.ActiveCfg = Debug|x64
{EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Debug|x64.Build.0 = Debug|x64
{EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Release|ORBIS.ActiveCfg = Release|Win32
{EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Release|Win32.ActiveCfg = Release|Win32
{EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Release|Win32.Build.0 = Release|Win32
{EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Release|x64.ActiveCfg = Release|x64
{EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Release|x64.Build.0 = Release|x64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|ORBIS.ActiveCfg = Debug|Win32
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win32.ActiveCfg = Debug|Win32
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|Win32.Build.0 = Debug|Win32
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|x64.ActiveCfg = Debug|x64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Debug|x64.Build.0 = Debug|x64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|ORBIS.ActiveCfg = Release|Win32
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win32.ActiveCfg = Release|Win32
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Win32.Build.0 = Release|Win32
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.ActiveCfg = Release|x64
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|x64.Build.0 = Release|x64
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|ORBIS.ActiveCfg = Debug|Win32
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Win32.ActiveCfg = Debug|Win32
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Win32.Build.0 = Debug|Win32
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|x64.ActiveCfg = Debug|x64
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|x64.Build.0 = Debug|x64
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|ORBIS.ActiveCfg = Release|Win32
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Win32.ActiveCfg = Release|Win32
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Win32.Build.0 = Release|Win32
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|x64.ActiveCfg = Release|x64
{73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|x64.Build.0 = Release|x64
{EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|ORBIS.ActiveCfg = Debug|Win32
{EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|Win32.ActiveCfg = Debug|Win32
{EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|Win32.Build.0 = Debug|Win32
{EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|x64.ActiveCfg = Debug|x64
{EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Debug|x64.Build.0 = Debug|x64
{EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|ORBIS.ActiveCfg = Release|Win32
{EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|Win32.ActiveCfg = Release|Win32
{EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|Win32.Build.0 = Release|Win32
{EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|x64.ActiveCfg = Release|x64
{EE203B88-44CF-4859-9D42-7A4F43FEDB52}.Release|x64.Build.0 = Release|x64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|ORBIS.ActiveCfg = Debug|Win32
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Win32.ActiveCfg = Debug|Win32
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|Win32.Build.0 = Debug|Win32
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|x64.ActiveCfg = Debug|x64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Debug|x64.Build.0 = Debug|x64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|ORBIS.ActiveCfg = Release|Win32
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Win32.ActiveCfg = Release|Win32
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|Win32.Build.0 = Release|Win32
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|x64.ActiveCfg = Release|x64
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF}.Release|x64.Build.0 = Release|x64
{B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|ORBIS.ActiveCfg = Debug|Win32
{B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|Win32.ActiveCfg = Debug|Win32
{B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|Win32.Build.0 = Debug|Win32
{B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|x64.ActiveCfg = Debug|x64
{B9A255A0-2B92-4801-AF6C-354535A6E105}.Debug|x64.Build.0 = Debug|x64
{B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|ORBIS.ActiveCfg = Release|Win32
{B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|Win32.ActiveCfg = Release|Win32
{B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|Win32.Build.0 = Release|Win32
{B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|x64.ActiveCfg = Release|x64
{B9A255A0-2B92-4801-AF6C-354535A6E105}.Release|x64.Build.0 = Release|x64
{775B46F7-03C4-4351-B78D-76088E028D14}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{775B46F7-03C4-4351-B78D-76088E028D14}.Debug|ORBIS.Build.0 = Debug|ORBIS
{775B46F7-03C4-4351-B78D-76088E028D14}.Debug|Win32.ActiveCfg = Debug|Win32
{775B46F7-03C4-4351-B78D-76088E028D14}.Debug|Win32.Build.0 = Debug|Win32
{775B46F7-03C4-4351-B78D-76088E028D14}.Debug|x64.ActiveCfg = Debug|x64
{775B46F7-03C4-4351-B78D-76088E028D14}.Debug|x64.Build.0 = Debug|x64
{775B46F7-03C4-4351-B78D-76088E028D14}.Release|ORBIS.ActiveCfg = Release|ORBIS
{775B46F7-03C4-4351-B78D-76088E028D14}.Release|ORBIS.Build.0 = Release|ORBIS
{775B46F7-03C4-4351-B78D-76088E028D14}.Release|Win32.ActiveCfg = Release|Win32
{775B46F7-03C4-4351-B78D-76088E028D14}.Release|Win32.Build.0 = Release|Win32
{775B46F7-03C4-4351-B78D-76088E028D14}.Release|x64.ActiveCfg = Release|x64
{775B46F7-03C4-4351-B78D-76088E028D14}.Release|x64.Build.0 = Release|x64
{010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|ORBIS.Build.0 = Debug|ORBIS
{010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|Win32.ActiveCfg = Debug|Win32
{010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|Win32.Build.0 = Debug|Win32
{010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|x64.ActiveCfg = Debug|x64
{010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Debug|x64.Build.0 = Debug|x64
{010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|ORBIS.ActiveCfg = Release|ORBIS
{010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|ORBIS.Build.0 = Release|ORBIS
{010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|Win32.ActiveCfg = Release|Win32
{010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|Win32.Build.0 = Release|Win32
{010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|x64.ActiveCfg = Release|x64
{010BF56B-2D3A-4EBE-839C-0B734EB368CA}.Release|x64.Build.0 = Release|x64
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Debug|ORBIS.ActiveCfg = Debug|ORBIS
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Debug|ORBIS.Build.0 = Debug|ORBIS
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Debug|Win32.ActiveCfg = Debug|Win32
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Debug|Win32.Build.0 = Debug|Win32
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Debug|x64.ActiveCfg = Debug|x64
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Debug|x64.Build.0 = Debug|x64
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Release|ORBIS.ActiveCfg = Release|ORBIS
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Release|ORBIS.Build.0 = Release|ORBIS
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Release|Win32.ActiveCfg = Release|Win32
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Release|Win32.Build.0 = Release|Win32
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Release|x64.ActiveCfg = Release|x64
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{EF1A4E80-63FA-4EB0-B834-12B6C500F31C} = {08C6A854-533D-4A1E-924E-C4A62281869F}
{17F0F184-4436-4D08-B8AA-16572EA238DB} = {2F87CEAB-4818-443C-A5E3-6C34E7D967EC}
{9C66B179-0737-4BDA-AB42-2ADE478A9008} = {08C6A854-533D-4A1E-924E-C4A62281869F}
{08C6A854-533D-4A1E-924E-C4A62281869F} = {928A359C-9C41-400A-8D2D-A054B33A79F5}
{2F87CEAB-4818-443C-A5E3-6C34E7D967EC} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
{9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {1AFD580B-98B8-4689-B661-38C41132C60E}
{83D3B207-C601-4025-8F41-01DEDC354661} = {1AFD580B-98B8-4689-B661-38C41132C60E}
{D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {1AFD580B-98B8-4689-B661-38C41132C60E}
{8F59A635-0240-4D7F-A80D-050C3F1670C2} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
{962D4E25-45D3-4ACE-8C02-69FA3713ABD4} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
{1782F849-B6E1-466D-9F02-A751F3F8712C} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
{5A27FF18-A1EC-49BE-9455-415F1C701153} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3} = {E4DFEBF9-C310-462F-9876-7EB59C1E4D4E}
{B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA}
{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} = {65FD48E9-C936-4A23-AD46-BF738B6D4733}
{B92ABADC-45BE-4CC5-B724-9426053123A1} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
{1C5B8702-290C-42DA-AA9E-671348F5B747} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
{33704AA4-F2B5-4138-A40D-E3E77F89ED46} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
{32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46}
{8C77EAA8-1077-4EF7-AE53-97C6C60A3601} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
{EE203B88-44CF-4859-9D42-7A5F40FECB52} = {8C77EAA8-1077-4EF7-AE53-97C6C60A3601}
{B357514A-7881-422D-8358-161B689E7620} = {3D341D8A-E400-4B1D-BC05-B5C35487D9B5}
{587FCCE9-1D8D-4398-B8B6-E8F4E9A92233} = {B357514A-7881-422D-8358-161B689E7620}
{9EA99B18-D352-47F6-BC04-A0B49CAA2772} = {5F1AAF03-7202-4C07-B99F-EB397105B1B7}
{EE203B88-44CF-4859-9D42-7A5F43FECB52} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
{EE203B88-44CF-4859-9D42-7A1F43FECB52} = {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA}
{BCEE0132-8E24-49BE-AFEB-96DAD14396BA} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
{0A1651FC-322B-4B04-82CB-28E9046D9383} = {5F1AAF03-7202-4C07-B99F-EB397105B1B7}
{A69411B3-6DE8-404E-8E70-0D3375A7492A} = {0A1651FC-322B-4B04-82CB-28E9046D9383}
{928A359C-9C41-400A-8D2D-A054B33A79F5} = {5F1AAF03-7202-4C07-B99F-EB397105B1B7}
{E27FDF36-50C4-4ED2-8CF5-A20FED016910} = {5F1AAF03-7202-4C07-B99F-EB397105B1B7}
{C2E01551-B636-4324-8461-71811DF6FBB5} = {E27FDF36-50C4-4ED2-8CF5-A20FED016910}
{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
{5A77DCDD-2CBA-43E9-8B45-00C281443F77} = {0A1651FC-322B-4B04-82CB-28E9046D9383}
{834852DB-EDB6-4FD0-BCF9-45CD01126962} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
{B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0} = {5F1AAF03-7202-4C07-B99F-EB397105B1B7}
{FAF82AD2-D9F4-4694-9A01-103BC5B771B4} = {B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0}
{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E} = {B6297FF2-63D0-41EE-BE13-EFF720C9B0FA}
{25493FC8-75AC-4703-AD58-AB0C4A0FB79C} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
{AA376B9B-484B-4DC4-982F-6CFA645E441E} = {F7D4A671-612F-4FF4-883F-2097697694B7}
{F7D4A671-612F-4FF4-883F-2097697694B7} = {E5C5E320-C077-4362-9A3F-3920C6447601}
{572E5B9C-7E19-489C-BD8A-E8401CFBBC47} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
{52493826-AC00-470B-A745-4F602529B3B0} = {B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0}
{9F291982-8C81-4105-BF39-16844648E55F} = {B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0}
{950EDCC1-DF6A-4A75-B083-DFE98E7DD34F} = {B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0}
{50509BA3-D27B-4FAC-9772-9EC76146F709} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
{5D994A3B-83BF-4FCB-9AC1-E7B642B46FEA} = {50509BA3-D27B-4FAC-9772-9EC76146F709}
{454DE15C-9063-4EB1-AD6C-77D7150F15DF} = {5F1AAF03-7202-4C07-B99F-EB397105B1B7}
{C3E2D690-F2B4-4A11-B317-D5CB8EF9561A} = {454DE15C-9063-4EB1-AD6C-77D7150F15DF}
{EE203B88-44CF-4829-9D42-7A5F43FECB52} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
{7422B977-CA61-49BF-A586-F57B6FF9BD64} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
{DB344310-4938-4294-AEE2-18512454585D} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
{2195FB18-53BF-48AF-96B6-9BD242924EA5} = {3D341D8A-E400-4B1D-BC05-B5C35487D9B5}
{FFF58874-D460-41E6-AD65-DBFEC6E47A94} = {2195FB18-53BF-48AF-96B6-9BD242924EA5}
{E4DFEBF9-C310-462F-9876-7EB59C1E4D4E} = {1AFD580B-98B8-4689-B661-38C41132C60E}
{EE203B88-44CF-4859-9D42-7A5F45FEDB52} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
{4C4BD478-3767-4C27-BD91-DAAFE7CD03A2} = {3D341D8A-E400-4B1D-BC05-B5C35487D9B5}
{73F1A804-1116-46C3-922A-9C0ADEB33F52} = {4C4BD478-3767-4C27-BD91-DAAFE7CD03A2}
{B6297FF2-63D0-41EE-BE13-EFF720C9B0FA} = {65FD48E9-C936-4A23-AD46-BF738B6D4733}
{EE203B88-44CF-4859-9D42-7A4F43FEDB52} = {9EA99B18-D352-47F6-BC04-A0B49CAA2772}
{81C83B42-D00A-4FA3-9A3D-80F9D46524BF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
{65114D40-9450-4B2D-B051-7A75E97C88E1} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
{B9A255A0-2B92-4801-AF6C-354535A6E105} = {65114D40-9450-4B2D-B051-7A75E97C88E1}
{CE356481-3D75-425A-9970-766340FB88FC} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
{775B46F7-03C4-4351-B78D-76088E028D14} = {CE356481-3D75-425A-9970-766340FB88FC}
{3961536A-EF8C-4CC2-9E9C-1E5AF91288E3} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
{010BF56B-2D3A-4EBE-839C-0B734EB368CA} = {3961536A-EF8C-4CC2-9E9C-1E5AF91288E3}
{248073F0-AEF0-4776-88E2-50F1D09D9E87} = {1DFE1729-4F1B-47CA-9819-72431FE14E25}
{6CDB0A27-FE32-49E1-A079-5C9ACFF08420} = {248073F0-AEF0-4776-88E2-50F1D09D9E87}
EndGlobalSection
EndGlobal

+ 1
- 1
src/lol/base/string.h Переглянути файл

@@ -239,7 +239,7 @@ public:
ret.push(String(C() + start));
break;
}
int size = tmp - C() - start;
int size = int(tmp - C()) - start;
ret.push(String(C() + start, size));
start += size + 1;
}


+ 4
- 0
src/lol/math/matrix.h Переглянути файл

@@ -38,6 +38,7 @@ struct mat_t
: public linear_ops::base<vec_t<T,ROWS>>
{
static int const count = COLS;
typedef T scalar_element;
typedef vec_t<T,ROWS> element;
typedef mat_t<T,COLS,ROWS> type;

@@ -75,6 +76,7 @@ struct mat_t<T, 2, 2>
: public linear_ops::base<vec_t<T,2>>
{
static int const count = 2;
typedef T scalar_element;
typedef vec_t<T,2> element;
typedef mat_t<T,2,2> type;

@@ -159,6 +161,7 @@ struct mat_t<T, 3, 3>
: public linear_ops::base<vec_t<T,3>>
{
static int const count = 3;
typedef T scalar_element;
typedef vec_t<T,3> element;
typedef mat_t<T,3,3> type;

@@ -289,6 +292,7 @@ struct mat_t<T, 4, 4>
: public linear_ops::base<vec_t<T,4>>
{
static int const count = 4;
typedef T scalar_element;
typedef vec_t<T,4> element;
typedef mat_t<T,4,4> type;



+ 10
- 10
src/lol/math/ops.h Переглянути файл

@@ -219,8 +219,8 @@ static inline typename std::enable_if<std::is_base_of<base<typename V::element>,
*/

template<typename V>
static inline typename std::enable_if<std::is_base_of<base<typename V::element>, V>::value, typename V::type>::type
operator *(typename V::element const &val, V const &a)
static inline typename std::enable_if<std::is_base_of<base<typename V::scalar_element>, V>::value, typename V::type>::type
operator *(typename V::scalar_element const &val, V const &a)
{
typename V::type ret;
for (int i = 0; i < V::count; ++i)
@@ -233,8 +233,8 @@ operator *(typename V::element const &val, V const &a)
*/

template<typename V>
static inline typename std::enable_if<std::is_base_of<base<typename V::element>, V>::value, typename V::type>::type
operator *(V const &a, typename V::element const &val)
static inline typename std::enable_if<std::is_base_of<base<typename V::scalar_element>, V>::value, typename V::type>::type
operator *(V const &a, typename V::scalar_element const &val)
{
typename V::type ret;
for (int i = 0; i < V::count; ++i)
@@ -243,15 +243,15 @@ operator *(V const &a, typename V::element const &val)
}

template<typename V>
static inline typename std::enable_if<std::is_base_of<base<typename V::element>, V>::value, typename V::type>::type &
operator *=(V &a, typename V::element const &val)
static inline typename std::enable_if<std::is_base_of<base<typename V::scalar_element>, V>::value, typename V::type>::type &
operator *=(V &a, typename V::scalar_element const &val)
{
return a = a * val;
}

template<typename V>
static inline typename std::enable_if<std::is_base_of<base<typename V::element>, V>::value, typename V::type>::type
operator /(V const &a, typename V::element const &val)
static inline typename std::enable_if<std::is_base_of<base<typename V::scalar_element>, V>::value, typename V::type>::type
operator /(V const &a, typename V::scalar_element const &val)
{
typename V::type ret;
for (int i = 0; i < V::count; ++i)
@@ -260,8 +260,8 @@ operator /(V const &a, typename V::element const &val)
}

template<typename V>
static inline typename std::enable_if<std::is_base_of<base<typename V::element>, V>::value, typename V::type>::type &
operator /=(V &a, typename V::element const &val)
static inline typename std::enable_if<std::is_base_of<base<typename V::scalar_element>, V>::value, typename V::type>::type &
operator /=(V &a, typename V::scalar_element const &val)
{
return a = a / val;
}


+ 8
- 0
src/lol/math/polynomial.h Переглянути файл

@@ -226,21 +226,29 @@ struct polynomial
}

if (a == d && b == c && b == T(3)*a) // triple solution
{
return array<T> { solutions[0] - k };
}

// if root of the derivative is also root of the current polynomial, we have a double root.
for (auto root : (polynomial<T>{ c, T(2) * b, T(3) * a }).roots())
{
if (eval(root) == T(0))
return array<T> { (solutions[0] + solutions[2]) / T(2) - k,
solutions[1] - k };
}

// we have 3 or 1 root depending on delta sign
if (delta > 0)
{
return array<T> { solutions[0] - k };
}
else // if (delta < 0) 3 real solutions
{
return array<T> { solutions[0] - k,
solutions[1] - k,
solutions[2] - k };
}
}

/* It is an error to reach this point. */


+ 2
- 0
src/lol/math/transform.h Переглянути файл

@@ -34,6 +34,7 @@ template<typename T>
struct cmplx_t : public linear_ops::base<T>
{
static int const count = 2;
typedef T scalar_element;
typedef T element;
typedef cmplx_t<T> type;

@@ -80,6 +81,7 @@ template<typename T>
struct quat_t : public linear_ops::base<T>
{
static int const count = 4;
typedef T scalar_element;
typedef T element;
typedef quat_t<T> type;



+ 5
- 0
src/lol/math/vector.h Переглянути файл

@@ -64,6 +64,7 @@ struct vec_t
: public swizzle_ops::base<T, SWIZZLE>
{
static int const count = N;
typedef T scalar_element;
typedef T element;
typedef vec_t<T,N> type;

@@ -111,6 +112,7 @@ struct vec_t<T, N, FULL_SWIZZLE>
: public componentwise_ops::base<T>
{
static int const count = N;
typedef T scalar_element;
typedef T element;
typedef vec_t<T,N> type;

@@ -223,6 +225,7 @@ struct vec_t<T,2>
: public swizzle_ops::base<T>
{
static int const count = 2;
typedef T scalar_element;
typedef T element;
typedef vec_t<T,2> type;

@@ -338,6 +341,7 @@ struct vec_t<T,3>
: public swizzle_ops::base<T>
{
static int const count = 3;
typedef T scalar_element;
typedef T element;
typedef vec_t<T,3> type;

@@ -583,6 +587,7 @@ struct vec_t<T,4>
: public swizzle_ops::base<T>
{
static int const count = 4;
typedef T scalar_element;
typedef T element;
typedef vec_t<T,4> type;



+ 1
- 1
src/lolua/baselua.h Переглянути файл

@@ -553,7 +553,7 @@ template<> inline bool Var<uint32_t>::InnerIsValid(LuaState* l, int index)
}
template<> inline void Var<uint32_t>::InnerGet(LuaState* l, int& index)
{
m_value = (lua_Unsigned)lua_tointeger(l, index++);
m_value = (uint32_t)(lua_Unsigned)lua_tointeger(l, index++);
}
template<> inline int Var<uint32_t>::InnerPush(LuaState* l)
{


Завантаження…
Відмінити
Зберегти