diff --git a/.gitignore b/.gitignore index 7e83037a..13a2d23c 100644 --- a/.gitignore +++ b/.gitignore @@ -75,25 +75,25 @@ _ReSharper.* !external/*/*/*/*/*/*/* # Our binaries demos/lol.js/lol.js -demos/test/benchsuite -demos/test/btphystest -demos/test/meshviewer -demos/test/nacl_phystest -demos/test/sandbox/sample -demos/test/math/pi -demos/test/math/poly -demos/test/nacl_phystest -demos/test/simplex -demos/tutorial/01_triangle -demos/tutorial/02_cube -demos/tutorial/03_noise -demos/tutorial/04_texture -demos/tutorial/05_easymesh -demos/tutorial/06_sprite -demos/tutorial/07_input -demos/tutorial/08_fbo -demos/tutorial/11_fractal -demos/tutorial/12_voronoi +doc/samples/benchsuite +doc/samples/btphystest +doc/samples/meshviewer +doc/samples/nacl_phystest +doc/samples/sandbox/sample +doc/samples/math/pi +doc/samples/math/poly +doc/samples/nacl_phystest +doc/samples/simplex +doc/tutorial/01_triangle +doc/tutorial/02_cube +doc/tutorial/03_noise +doc/tutorial/04_texture +doc/tutorial/05_easymesh +doc/tutorial/06_sprite +doc/tutorial/07_input +doc/tutorial/08_fbo +doc/tutorial/11_fractal +doc/tutorial/12_voronoi tools/make-font # Our data doc/doxygen.cfg diff --git a/build/Lol (vs2013).sln b/build/Lol (vs2013).sln index a4779f37..8bdf1ca5 100644 --- a/build/Lol (vs2013).sln +++ b/build/Lol (vs2013).sln @@ -29,19 +29,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-image", "..\src\t\test EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-entity", "..\src\t\test-entity.vcxproj", "{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "..\demos\test\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}" +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", "..\demos\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}" +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", "..\demos\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}" +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", "..\demos\tutorial\05_easymesh.vcxproj", "{1C5B8702-290C-42DA-AA9E-671348F5B747}" +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", "..\demos\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}" +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 @@ -68,9 +66,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Touky", "Touky", "{9EA99B18 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", "..\demos\test\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}" +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", "..\demos\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}" +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 @@ -84,21 +82,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Peeweek", "Peeweek", "{E27F 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", "..\demos\tutorial\03_noise.vcxproj", "{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}" +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", "..\demos\tutorial\04_texture.vcxproj", "{834852DB-EDB6-4FD0-BCF9-45CD01126962}" +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", "..\demos\test\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\doc\samples\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", "..\demos\tutorial\12_Voronoi.vcxproj", "{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}" +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 @@ -108,9 +106,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{E5C5E320 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", "..\demos\tutorial\07_input.vcxproj", "{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}" +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", "..\demos\tutorial\06_sprite.vcxproj", "{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}" +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 @@ -140,12 +138,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Unit Test", "Unit Test", "{ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "top_shooter", "..\people\touky\top_shooter\top_shooter.vcxproj", "{EE203B88-44CF-4859-9D42-7A5F45FEDB52}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "13_shader_builder", "..\demos\tutorial\13_shader_builder.vcxproj", "{F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}" +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}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{65FD48E9-C936-4A23-AD46-BF738B6D4733}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ORBIS = Debug|ORBIS @@ -737,9 +739,8 @@ Global {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} - {E0491194-35E3-4513-9D31-608EA3165ECF} = {E5C5E320-C077-4362-9A3F-3920C6447601} - {B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {E0491194-35E3-4513-9D31-608EA3165ECF} - {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} = {E5C5E320-C077-4362-9A3F-3920C6447601} + {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} @@ -752,7 +753,7 @@ Global {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} = {E0491194-35E3-4513-9D31-608EA3165ECF} + {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} @@ -764,7 +765,7 @@ Global {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} = {E0491194-35E3-4513-9D31-608EA3165ECF} + {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} @@ -789,5 +790,6 @@ Global {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} EndGlobalSection EndGlobal diff --git a/build/Lol (vs2014).sln b/build/Lol (vs2014).sln index 204cc834..e88d093b 100644 --- a/build/Lol (vs2014).sln +++ b/build/Lol (vs2014).sln @@ -29,19 +29,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-image", "..\src\t\test EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test-entity", "..\src\t\test-entity.vcxproj", "{D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test", "Test", "{E0491194-35E3-4513-9D31-608EA3165ECF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchsuite", "..\demos\test\benchsuite.vcxproj", "{B1E10086-A1DA-401A-834D-969C9DBB5CC1}" +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", "..\demos\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}" +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", "..\demos\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}" +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", "..\demos\tutorial\05_easymesh.vcxproj", "{1C5B8702-290C-42DA-AA9E-671348F5B747}" +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", "..\demos\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}" +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 @@ -68,9 +66,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Touky", "Touky", "{9EA99B18 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", "..\demos\test\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}" +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", "..\demos\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}" +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 @@ -84,21 +82,21 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Peeweek", "Peeweek", "{E27F 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", "..\demos\tutorial\03_noise.vcxproj", "{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}" +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", "..\demos\tutorial\04_texture.vcxproj", "{834852DB-EDB6-4FD0-BCF9-45CD01126962}" +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", "..\demos\test\meshviewer.vcxproj", "{7CE9FE12-E4AB-4A22-90D4-2C15F0C30D4E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\doc\samples\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", "..\demos\tutorial\12_Voronoi.vcxproj", "{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}" +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 @@ -108,9 +106,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Demos", "Demos", "{E5C5E320 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", "..\demos\tutorial\07_input.vcxproj", "{572E5B9C-7E19-489C-BD8A-E8401CFBBC47}" +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", "..\demos\tutorial\06_sprite.vcxproj", "{E05E23A5-67DE-42B5-98A3-E63CCE0CC0AF}" +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 @@ -138,6 +136,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pimp", "..\tools\pimp\pimp. 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}" +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}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{65FD48E9-C936-4A23-AD46-BF738B6D4733}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ORBIS = Debug|ORBIS @@ -225,96 +235,66 @@ Global {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.ActiveCfg = Release|x64 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|x64.Build.0 = Release|x64 {D84021CA-B233-4E0F-8A52-071B83BBCCC4}.Release|Xbox 360.ActiveCfg = Release|Win32 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.ActiveCfg = Debug|ORBIS - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|ORBIS.Build.0 = Debug|ORBIS + {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}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.ActiveCfg = Release|ORBIS - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|ORBIS.Build.0 = Release|ORBIS + {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Debug|Xbox 360.ActiveCfg = Debug|Win32 + {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 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Xbox 360.Build.0 = Release|Xbox 360 - {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.ActiveCfg = Debug|ORBIS - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|ORBIS.Build.0 = Debug|ORBIS + {8F59A635-0240-4D7F-A80D-050C3F1670C2}.Release|Xbox 360.ActiveCfg = Release|Win32 + {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}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.ActiveCfg = Release|ORBIS - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|ORBIS.Build.0 = Release|ORBIS + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Debug|Xbox 360.ActiveCfg = Debug|Win32 + {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 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Xbox 360.Build.0 = Release|Xbox 360 - {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.ActiveCfg = Debug|ORBIS - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|ORBIS.Build.0 = Debug|ORBIS + {962D4E25-45D3-4ACE-8C02-69FA3713ABD4}.Release|Xbox 360.ActiveCfg = Release|Win32 + {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}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.ActiveCfg = Release|ORBIS - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|ORBIS.Build.0 = Release|ORBIS + {1782F849-B6E1-466D-9F02-A751F3F8712C}.Debug|Xbox 360.ActiveCfg = Debug|Win32 + {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 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Xbox 360.Build.0 = Release|Xbox 360 - {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.ActiveCfg = Debug|ORBIS - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|ORBIS.Build.0 = Debug|ORBIS + {1782F849-B6E1-466D-9F02-A751F3F8712C}.Release|Xbox 360.ActiveCfg = Release|Win32 + {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}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.ActiveCfg = Release|ORBIS - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|ORBIS.Build.0 = Release|ORBIS + {5A27FF18-A1EC-49BE-9455-415F1C701153}.Debug|Xbox 360.ActiveCfg = Debug|Win32 + {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 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Xbox 360.Build.0 = Release|Xbox 360 - {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.ActiveCfg = Debug|ORBIS - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|ORBIS.Build.0 = Debug|ORBIS + {5A27FF18-A1EC-49BE-9455-415F1C701153}.Release|Xbox 360.ActiveCfg = Release|Win32 + {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}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.ActiveCfg = Release|ORBIS - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|ORBIS.Build.0 = Release|ORBIS + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Debug|Xbox 360.ActiveCfg = Debug|Win32 + {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 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.Build.0 = Release|Xbox 360 - {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 + {D7F6C2CA-5A13-4FD0-8468-1833923E3EE3}.Release|Xbox 360.ActiveCfg = Release|Win32 {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 @@ -699,6 +679,48 @@ Global {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|x64.Build.0 = Release|x64 {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|x64.Deploy.0 = Release|x64 {FFF58874-D460-41E6-AD65-DBFEC6E47A94}.Release|Xbox 360.ActiveCfg = Release|Win32 + {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}.Debug|Xbox 360.ActiveCfg = Debug|Win32 + {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 + {EE203B88-44CF-4859-9D42-7A5F45FEDB52}.Release|Xbox 360.ActiveCfg = Release|Win32 + {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}.Debug|Xbox 360.ActiveCfg = Debug|Win32 + {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 + {F59FA82C-DDB9-4EE2-80AE-CB0E4C6567A4}.Release|Xbox 360.ActiveCfg = Release|Win32 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|ORBIS.ActiveCfg = Debug|ORBIS + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|ORBIS.Build.0 = Debug|ORBIS + {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}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Xbox 360.Build.0 = Debug|Xbox 360 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|ORBIS.ActiveCfg = Release|ORBIS + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|ORBIS.Build.0 = Release|ORBIS + {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 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Xbox 360.ActiveCfg = Release|Xbox 360 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Xbox 360.Build.0 = Release|Xbox 360 + {73F1A804-1116-46C3-922A-9C0ADEB33F52}.Release|Xbox 360.Deploy.0 = Release|Xbox 360 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -717,9 +739,8 @@ Global {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} - {E0491194-35E3-4513-9D31-608EA3165ECF} = {E5C5E320-C077-4362-9A3F-3920C6447601} - {B1E10086-A1DA-401A-834D-969C9DBB5CC1} = {E0491194-35E3-4513-9D31-608EA3165ECF} - {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04} = {E5C5E320-C077-4362-9A3F-3920C6447601} + {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} @@ -732,7 +753,7 @@ Global {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} = {E0491194-35E3-4513-9D31-608EA3165ECF} + {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} @@ -744,7 +765,7 @@ Global {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} = {E0491194-35E3-4513-9D31-608EA3165ECF} + {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} @@ -765,5 +786,10 @@ Global {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} EndGlobalSection EndGlobal diff --git a/configure.ac b/configure.ac index 66cd677a..b3b75485 100644 --- a/configure.ac +++ b/configure.ac @@ -491,6 +491,10 @@ AC_CONFIG_FILES( tools/vslol/Makefile doc/Makefile doc/doxygen.cfg + doc/samples/Makefile + doc/samples/math/Makefile + doc/samples/sandbox/Makefile + doc/tutorial/Makefile ]) AC_CONFIG_FILES( [games/monsterz/Makefile @@ -520,11 +524,7 @@ AC_CONFIG_FILES( [games/singlshot/Makefile ]) AC_CONFIG_FILES( - [demos/tutorial/Makefile - demos/lol.js/Makefile - demos/test/Makefile - demos/test/math/Makefile - demos/test/sandbox/Makefile + [demos/lol.js/Makefile ]) AC_CONFIG_FILES( [tools/lolremez/Makefile diff --git a/demos/Makefile.am b/demos/Makefile.am index 615408e8..18898cd6 100644 --- a/demos/Makefile.am +++ b/demos/Makefile.am @@ -3,6 +3,4 @@ include $(top_srcdir)/build/autotools/common.am SUBDIRS = SUBDIRS += lol.js -SUBDIRS += test -SUBDIRS += tutorial diff --git a/doc/Makefile.am b/doc/Makefile.am index 3d1cd0d8..36ffb904 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,9 @@ include $(top_srcdir)/build/autotools/common.am +SUBDIRS = +SUBDIRS += tutorial +SUBDIRS += samples + EXTRA_DIST += doxygen.cfg.in doxygen.css footer.html header.html \ $(man_MANS) $(doxygen_DOX) CLEANFILES += doxygen.log stamp-latex stamp-doxygen diff --git a/demos/test/Makefile.am b/doc/samples/Makefile.am similarity index 100% rename from demos/test/Makefile.am rename to doc/samples/Makefile.am diff --git a/demos/test/benchmark/half.cpp b/doc/samples/benchmark/half.cpp similarity index 100% rename from demos/test/benchmark/half.cpp rename to doc/samples/benchmark/half.cpp diff --git a/demos/test/benchmark/real.cpp b/doc/samples/benchmark/real.cpp similarity index 100% rename from demos/test/benchmark/real.cpp rename to doc/samples/benchmark/real.cpp diff --git a/demos/test/benchmark/trig.cpp b/doc/samples/benchmark/trig.cpp similarity index 100% rename from demos/test/benchmark/trig.cpp rename to doc/samples/benchmark/trig.cpp diff --git a/demos/test/benchmark/vector.cpp b/doc/samples/benchmark/vector.cpp similarity index 100% rename from demos/test/benchmark/vector.cpp rename to doc/samples/benchmark/vector.cpp diff --git a/demos/test/benchsuite.cpp b/doc/samples/benchsuite.cpp similarity index 100% rename from demos/test/benchsuite.cpp rename to doc/samples/benchsuite.cpp diff --git a/demos/test/benchsuite.vcxproj b/doc/samples/benchsuite.vcxproj similarity index 100% rename from demos/test/benchsuite.vcxproj rename to doc/samples/benchsuite.vcxproj diff --git a/demos/test/btphystest.cpp b/doc/samples/btphystest.cpp similarity index 100% rename from demos/test/btphystest.cpp rename to doc/samples/btphystest.cpp diff --git a/demos/test/btphystest.h b/doc/samples/btphystest.h similarity index 100% rename from demos/test/btphystest.h rename to doc/samples/btphystest.h diff --git a/demos/test/btphystest.vcxproj b/doc/samples/btphystest.vcxproj similarity index 100% rename from demos/test/btphystest.vcxproj rename to doc/samples/btphystest.vcxproj diff --git a/demos/test/btphystest.vcxproj.filters b/doc/samples/btphystest.vcxproj.filters similarity index 100% rename from demos/test/btphystest.vcxproj.filters rename to doc/samples/btphystest.vcxproj.filters diff --git a/demos/test/data/CatsSheet.png b/doc/samples/data/CatsSheet.png similarity index 100% rename from demos/test/data/CatsSheet.png rename to doc/samples/data/CatsSheet.png diff --git a/demos/test/data/CatsSheet.xcf b/doc/samples/data/CatsSheet.xcf similarity index 100% rename from demos/test/data/CatsSheet.xcf rename to doc/samples/data/CatsSheet.xcf diff --git a/demos/test/data/mesh-buffer.txt b/doc/samples/data/mesh-buffer.txt similarity index 100% rename from demos/test/data/mesh-buffer.txt rename to doc/samples/data/mesh-buffer.txt diff --git a/demos/test/data/test-texture.png b/doc/samples/data/test-texture.png similarity index 100% rename from demos/test/data/test-texture.png rename to doc/samples/data/test-texture.png diff --git a/demos/test/easymeshdictionnary.js b/doc/samples/easymeshdictionnary.js similarity index 100% rename from demos/test/easymeshdictionnary.js rename to doc/samples/easymeshdictionnary.js diff --git a/demos/test/front_camera_sprite.lolfx b/doc/samples/front_camera_sprite.lolfx similarity index 100% rename from demos/test/front_camera_sprite.lolfx rename to doc/samples/front_camera_sprite.lolfx diff --git a/demos/test/generated/location.hh b/doc/samples/generated/location.hh similarity index 100% rename from demos/test/generated/location.hh rename to doc/samples/generated/location.hh diff --git a/demos/test/generated/position.hh b/doc/samples/generated/position.hh similarity index 100% rename from demos/test/generated/position.hh rename to doc/samples/generated/position.hh diff --git a/demos/test/generated/scenesetup-parser.cpp b/doc/samples/generated/scenesetup-parser.cpp similarity index 100% rename from demos/test/generated/scenesetup-parser.cpp rename to doc/samples/generated/scenesetup-parser.cpp diff --git a/demos/test/generated/scenesetup-parser.h b/doc/samples/generated/scenesetup-parser.h similarity index 100% rename from demos/test/generated/scenesetup-parser.h rename to doc/samples/generated/scenesetup-parser.h diff --git a/demos/test/generated/scenesetup-parser.output b/doc/samples/generated/scenesetup-parser.output similarity index 100% rename from demos/test/generated/scenesetup-parser.output rename to doc/samples/generated/scenesetup-parser.output diff --git a/demos/test/generated/scenesetup-scanner.cpp b/doc/samples/generated/scenesetup-scanner.cpp similarity index 100% rename from demos/test/generated/scenesetup-scanner.cpp rename to doc/samples/generated/scenesetup-scanner.cpp diff --git a/demos/test/generated/stack.hh b/doc/samples/generated/stack.hh similarity index 100% rename from demos/test/generated/stack.hh rename to doc/samples/generated/stack.hh diff --git a/demos/test/javascript/empty.html b/doc/samples/javascript/empty.html similarity index 100% rename from demos/test/javascript/empty.html rename to doc/samples/javascript/empty.html diff --git a/demos/test/javascript/naclloading.js b/doc/samples/javascript/naclloading.js similarity index 100% rename from demos/test/javascript/naclloading.js rename to doc/samples/javascript/naclloading.js diff --git a/demos/test/javascript/progressstatus.js b/doc/samples/javascript/progressstatus.js similarity index 100% rename from demos/test/javascript/progressstatus.js rename to doc/samples/javascript/progressstatus.js diff --git a/demos/test/javascript/typedictionnary.js b/doc/samples/javascript/typedictionnary.js similarity index 100% rename from demos/test/javascript/typedictionnary.js rename to doc/samples/javascript/typedictionnary.js diff --git a/demos/test/javascript/utils.js b/doc/samples/javascript/utils.js similarity index 100% rename from demos/test/javascript/utils.js rename to doc/samples/javascript/utils.js diff --git a/demos/test/math/Makefile.am b/doc/samples/math/Makefile.am similarity index 100% rename from demos/test/math/Makefile.am rename to doc/samples/math/Makefile.am diff --git a/demos/test/math/pi.cpp b/doc/samples/math/pi.cpp similarity index 100% rename from demos/test/math/pi.cpp rename to doc/samples/math/pi.cpp diff --git a/demos/test/math/poly.cpp b/doc/samples/math/poly.cpp similarity index 100% rename from demos/test/math/poly.cpp rename to doc/samples/math/poly.cpp diff --git a/demos/test/meshviewer.cpp b/doc/samples/meshviewer.cpp similarity index 100% rename from demos/test/meshviewer.cpp rename to doc/samples/meshviewer.cpp diff --git a/demos/test/meshviewer.em.html b/doc/samples/meshviewer.em.html similarity index 100% rename from demos/test/meshviewer.em.html rename to doc/samples/meshviewer.em.html diff --git a/demos/test/meshviewer.index.html b/doc/samples/meshviewer.index.html similarity index 100% rename from demos/test/meshviewer.index.html rename to doc/samples/meshviewer.index.html diff --git a/demos/test/meshviewer.nacl.html b/doc/samples/meshviewer.nacl.html similarity index 100% rename from demos/test/meshviewer.nacl.html rename to doc/samples/meshviewer.nacl.html diff --git a/demos/test/meshviewer.nacl.nmf b/doc/samples/meshviewer.nacl.nmf similarity index 100% rename from demos/test/meshviewer.nacl.nmf rename to doc/samples/meshviewer.nacl.nmf diff --git a/demos/test/meshviewer.vcxproj b/doc/samples/meshviewer.vcxproj similarity index 100% rename from demos/test/meshviewer.vcxproj rename to doc/samples/meshviewer.vcxproj diff --git a/demos/test/nacl_phystest.cpp b/doc/samples/nacl_phystest.cpp similarity index 100% rename from demos/test/nacl_phystest.cpp rename to doc/samples/nacl_phystest.cpp diff --git a/demos/test/nacl_phystest.h b/doc/samples/nacl_phystest.h similarity index 100% rename from demos/test/nacl_phystest.h rename to doc/samples/nacl_phystest.h diff --git a/demos/test/nacl_phystest.vcxproj b/doc/samples/nacl_phystest.vcxproj similarity index 100% rename from demos/test/nacl_phystest.vcxproj rename to doc/samples/nacl_phystest.vcxproj diff --git a/demos/test/nacl_phystest.vcxproj.filters b/doc/samples/nacl_phystest.vcxproj.filters similarity index 100% rename from demos/test/nacl_phystest.vcxproj.filters rename to doc/samples/nacl_phystest.vcxproj.filters diff --git a/demos/test/physicobject.h b/doc/samples/physicobject.h similarity index 100% rename from demos/test/physicobject.h rename to doc/samples/physicobject.h diff --git a/demos/test/physics/bulletcharactercontroller.cpp b/doc/samples/physics/bulletcharactercontroller.cpp similarity index 100% rename from demos/test/physics/bulletcharactercontroller.cpp rename to doc/samples/physics/bulletcharactercontroller.cpp diff --git a/demos/test/physics/bulletcharactercontroller.h b/doc/samples/physics/bulletcharactercontroller.h similarity index 100% rename from demos/test/physics/bulletcharactercontroller.h rename to doc/samples/physics/bulletcharactercontroller.h diff --git a/demos/test/physics/easycharactercontroller.cpp b/doc/samples/physics/easycharactercontroller.cpp similarity index 100% rename from demos/test/physics/easycharactercontroller.cpp rename to doc/samples/physics/easycharactercontroller.cpp diff --git a/demos/test/physics/easycharactercontroller.h b/doc/samples/physics/easycharactercontroller.h similarity index 100% rename from demos/test/physics/easycharactercontroller.h rename to doc/samples/physics/easycharactercontroller.h diff --git a/demos/test/physics/easyconstraint.cpp b/doc/samples/physics/easyconstraint.cpp similarity index 100% rename from demos/test/physics/easyconstraint.cpp rename to doc/samples/physics/easyconstraint.cpp diff --git a/demos/test/physics/easyconstraint.h b/doc/samples/physics/easyconstraint.h similarity index 100% rename from demos/test/physics/easyconstraint.h rename to doc/samples/physics/easyconstraint.h diff --git a/demos/test/physics/easyphysics.cpp b/doc/samples/physics/easyphysics.cpp similarity index 100% rename from demos/test/physics/easyphysics.cpp rename to doc/samples/physics/easyphysics.cpp diff --git a/demos/test/physics/easyphysics.h b/doc/samples/physics/easyphysics.h similarity index 100% rename from demos/test/physics/easyphysics.h rename to doc/samples/physics/easyphysics.h diff --git a/demos/test/physics/lolbtphysicsintegration.h b/doc/samples/physics/lolbtphysicsintegration.h similarity index 100% rename from demos/test/physics/lolbtphysicsintegration.h rename to doc/samples/physics/lolbtphysicsintegration.h diff --git a/demos/test/physics/lolphysics.h b/doc/samples/physics/lolphysics.h similarity index 100% rename from demos/test/physics/lolphysics.h rename to doc/samples/physics/lolphysics.h diff --git a/demos/test/sandbox/Makefile.am b/doc/samples/sandbox/Makefile.am similarity index 100% rename from demos/test/sandbox/Makefile.am rename to doc/samples/sandbox/Makefile.am diff --git a/demos/test/sandbox/sample.cpp b/doc/samples/sandbox/sample.cpp similarity index 100% rename from demos/test/sandbox/sample.cpp rename to doc/samples/sandbox/sample.cpp diff --git a/demos/test/scenesetup-compiler.cpp b/doc/samples/scenesetup-compiler.cpp similarity index 100% rename from demos/test/scenesetup-compiler.cpp rename to doc/samples/scenesetup-compiler.cpp diff --git a/demos/test/scenesetup-compiler.h b/doc/samples/scenesetup-compiler.h similarity index 100% rename from demos/test/scenesetup-compiler.h rename to doc/samples/scenesetup-compiler.h diff --git a/demos/test/scenesetup-parser.y b/doc/samples/scenesetup-parser.y similarity index 100% rename from demos/test/scenesetup-parser.y rename to doc/samples/scenesetup-parser.y diff --git a/demos/test/scenesetup-scanner.l b/doc/samples/scenesetup-scanner.l similarity index 100% rename from demos/test/scenesetup-scanner.l rename to doc/samples/scenesetup-scanner.l diff --git a/demos/test/scenesetup.cpp b/doc/samples/scenesetup.cpp similarity index 100% rename from demos/test/scenesetup.cpp rename to doc/samples/scenesetup.cpp diff --git a/demos/test/scenesetup.h b/doc/samples/scenesetup.h similarity index 100% rename from demos/test/scenesetup.h rename to doc/samples/scenesetup.h diff --git a/demos/test/scenesetupdictionnary.js b/doc/samples/scenesetupdictionnary.js similarity index 100% rename from demos/test/scenesetupdictionnary.js rename to doc/samples/scenesetupdictionnary.js diff --git a/demos/test/shinyfur.lolfx b/doc/samples/shinyfur.lolfx similarity index 100% rename from demos/test/shinyfur.lolfx rename to doc/samples/shinyfur.lolfx diff --git a/demos/test/shinymvtexture.lolfx b/doc/samples/shinymvtexture.lolfx similarity index 100% rename from demos/test/shinymvtexture.lolfx rename to doc/samples/shinymvtexture.lolfx diff --git a/demos/test/simplex.cpp b/doc/samples/simplex.cpp similarity index 100% rename from demos/test/simplex.cpp rename to doc/samples/simplex.cpp diff --git a/demos/tutorial/01_triangle.cpp b/doc/tutorial/01_triangle.cpp similarity index 100% rename from demos/tutorial/01_triangle.cpp rename to doc/tutorial/01_triangle.cpp diff --git a/demos/tutorial/01_triangle.lolfx b/doc/tutorial/01_triangle.lolfx similarity index 100% rename from demos/tutorial/01_triangle.lolfx rename to doc/tutorial/01_triangle.lolfx diff --git a/demos/tutorial/01_triangle.vcxproj b/doc/tutorial/01_triangle.vcxproj similarity index 100% rename from demos/tutorial/01_triangle.vcxproj rename to doc/tutorial/01_triangle.vcxproj diff --git a/demos/tutorial/02_cube.cpp b/doc/tutorial/02_cube.cpp similarity index 100% rename from demos/tutorial/02_cube.cpp rename to doc/tutorial/02_cube.cpp diff --git a/demos/tutorial/02_cube.lolfx b/doc/tutorial/02_cube.lolfx similarity index 100% rename from demos/tutorial/02_cube.lolfx rename to doc/tutorial/02_cube.lolfx diff --git a/demos/tutorial/02_cube.vcxproj b/doc/tutorial/02_cube.vcxproj similarity index 100% rename from demos/tutorial/02_cube.vcxproj rename to doc/tutorial/02_cube.vcxproj diff --git a/demos/tutorial/03_noise.cpp b/doc/tutorial/03_noise.cpp similarity index 100% rename from demos/tutorial/03_noise.cpp rename to doc/tutorial/03_noise.cpp diff --git a/demos/tutorial/03_noise.lolfx b/doc/tutorial/03_noise.lolfx similarity index 100% rename from demos/tutorial/03_noise.lolfx rename to doc/tutorial/03_noise.lolfx diff --git a/demos/tutorial/03_noise.vcxproj b/doc/tutorial/03_noise.vcxproj similarity index 100% rename from demos/tutorial/03_noise.vcxproj rename to doc/tutorial/03_noise.vcxproj diff --git a/demos/tutorial/04_texture.cpp b/doc/tutorial/04_texture.cpp similarity index 100% rename from demos/tutorial/04_texture.cpp rename to doc/tutorial/04_texture.cpp diff --git a/demos/tutorial/04_texture.lolfx b/doc/tutorial/04_texture.lolfx similarity index 100% rename from demos/tutorial/04_texture.lolfx rename to doc/tutorial/04_texture.lolfx diff --git a/demos/tutorial/04_texture.vcxproj b/doc/tutorial/04_texture.vcxproj similarity index 100% rename from demos/tutorial/04_texture.vcxproj rename to doc/tutorial/04_texture.vcxproj diff --git a/demos/tutorial/05_easymesh.cpp b/doc/tutorial/05_easymesh.cpp similarity index 100% rename from demos/tutorial/05_easymesh.cpp rename to doc/tutorial/05_easymesh.cpp diff --git a/demos/tutorial/05_easymesh.vcxproj b/doc/tutorial/05_easymesh.vcxproj similarity index 100% rename from demos/tutorial/05_easymesh.vcxproj rename to doc/tutorial/05_easymesh.vcxproj diff --git a/demos/tutorial/06_sprite.cpp b/doc/tutorial/06_sprite.cpp similarity index 100% rename from demos/tutorial/06_sprite.cpp rename to doc/tutorial/06_sprite.cpp diff --git a/demos/tutorial/06_sprite.png b/doc/tutorial/06_sprite.png similarity index 100% rename from demos/tutorial/06_sprite.png rename to doc/tutorial/06_sprite.png diff --git a/demos/tutorial/06_sprite.vcxproj b/doc/tutorial/06_sprite.vcxproj similarity index 100% rename from demos/tutorial/06_sprite.vcxproj rename to doc/tutorial/06_sprite.vcxproj diff --git a/demos/tutorial/07_input.cpp b/doc/tutorial/07_input.cpp similarity index 100% rename from demos/tutorial/07_input.cpp rename to doc/tutorial/07_input.cpp diff --git a/demos/tutorial/07_input.lolfx b/doc/tutorial/07_input.lolfx similarity index 100% rename from demos/tutorial/07_input.lolfx rename to doc/tutorial/07_input.lolfx diff --git a/demos/tutorial/07_input.vcxproj b/doc/tutorial/07_input.vcxproj similarity index 100% rename from demos/tutorial/07_input.vcxproj rename to doc/tutorial/07_input.vcxproj diff --git a/demos/tutorial/08_fbo.cpp b/doc/tutorial/08_fbo.cpp similarity index 100% rename from demos/tutorial/08_fbo.cpp rename to doc/tutorial/08_fbo.cpp diff --git a/demos/tutorial/08_fbo.lolfx b/doc/tutorial/08_fbo.lolfx similarity index 100% rename from demos/tutorial/08_fbo.lolfx rename to doc/tutorial/08_fbo.lolfx diff --git a/demos/tutorial/08_fbo.vcxproj b/doc/tutorial/08_fbo.vcxproj similarity index 100% rename from demos/tutorial/08_fbo.vcxproj rename to doc/tutorial/08_fbo.vcxproj diff --git a/demos/tutorial/11_fractal.cpp b/doc/tutorial/11_fractal.cpp similarity index 100% rename from demos/tutorial/11_fractal.cpp rename to doc/tutorial/11_fractal.cpp diff --git a/demos/tutorial/11_fractal.lolfx b/doc/tutorial/11_fractal.lolfx similarity index 100% rename from demos/tutorial/11_fractal.lolfx rename to doc/tutorial/11_fractal.lolfx diff --git a/demos/tutorial/11_fractal.vcxproj b/doc/tutorial/11_fractal.vcxproj similarity index 100% rename from demos/tutorial/11_fractal.vcxproj rename to doc/tutorial/11_fractal.vcxproj diff --git a/demos/tutorial/12_distance.lolfx b/doc/tutorial/12_distance.lolfx similarity index 100% rename from demos/tutorial/12_distance.lolfx rename to doc/tutorial/12_distance.lolfx diff --git a/demos/tutorial/12_texture_to_screen.lolfx b/doc/tutorial/12_texture_to_screen.lolfx similarity index 100% rename from demos/tutorial/12_texture_to_screen.lolfx rename to doc/tutorial/12_texture_to_screen.lolfx diff --git a/demos/tutorial/12_voronoi.cpp b/doc/tutorial/12_voronoi.cpp similarity index 100% rename from demos/tutorial/12_voronoi.cpp rename to doc/tutorial/12_voronoi.cpp diff --git a/demos/tutorial/12_voronoi.lolfx b/doc/tutorial/12_voronoi.lolfx similarity index 100% rename from demos/tutorial/12_voronoi.lolfx rename to doc/tutorial/12_voronoi.lolfx diff --git a/demos/tutorial/12_voronoi.vcxproj b/doc/tutorial/12_voronoi.vcxproj similarity index 100% rename from demos/tutorial/12_voronoi.vcxproj rename to doc/tutorial/12_voronoi.vcxproj diff --git a/demos/tutorial/12_voronoi_distance.lolfx b/doc/tutorial/12_voronoi_distance.lolfx similarity index 100% rename from demos/tutorial/12_voronoi_distance.lolfx rename to doc/tutorial/12_voronoi_distance.lolfx diff --git a/demos/tutorial/12_voronoi_setup.lolfx b/doc/tutorial/12_voronoi_setup.lolfx similarity index 100% rename from demos/tutorial/12_voronoi_setup.lolfx rename to doc/tutorial/12_voronoi_setup.lolfx diff --git a/demos/tutorial/13_shader_builder.cpp b/doc/tutorial/13_shader_builder.cpp similarity index 100% rename from demos/tutorial/13_shader_builder.cpp rename to doc/tutorial/13_shader_builder.cpp diff --git a/demos/tutorial/13_shader_builder.vcxproj b/doc/tutorial/13_shader_builder.vcxproj similarity index 100% rename from demos/tutorial/13_shader_builder.vcxproj rename to doc/tutorial/13_shader_builder.vcxproj diff --git a/demos/tutorial/Makefile.am b/doc/tutorial/Makefile.am similarity index 100% rename from demos/tutorial/Makefile.am rename to doc/tutorial/Makefile.am