From 6a8118cb187dd286aca8996cd1aefc74ebf0e6d0 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Mon, 1 Jul 2013 14:46:11 +0000 Subject: [PATCH] build: put tutorials and lol.js in a new "demos" directory. --- Makefile.am | 2 +- build/vs2010/Lol.sln | 18 +++++++++--------- configure.ac | 7 +++++-- demos/Makefile.am | 7 +++++++ {tutorial => demos/tutorial}/01_triangle.cpp | 0 .../tutorial}/01_triangle.lolfx | 0 .../tutorial}/01_triangle.vcxproj | 0 {tutorial => demos/tutorial}/02_cube.cpp | 0 {tutorial => demos/tutorial}/02_cube.lolfx | 0 {tutorial => demos/tutorial}/02_cube.vcxproj | 0 {tutorial => demos/tutorial}/03_noise.cpp | 0 {tutorial => demos/tutorial}/03_noise.lolfx | 0 {tutorial => demos/tutorial}/03_noise.vcxproj | 0 {tutorial => demos/tutorial}/04_texture.cpp | 0 {tutorial => demos/tutorial}/04_texture.lolfx | 0 .../tutorial}/04_texture.vcxproj | 0 {tutorial => demos/tutorial}/05_easymesh.cpp | 0 .../tutorial}/05_easymesh.vcxproj | 0 {tutorial => demos/tutorial}/06_sprite.cpp | 0 {tutorial => demos/tutorial}/06_sprite.png | Bin .../tutorial}/06_sprite.vcxproj | 0 {tutorial => demos/tutorial}/08_fbo.cpp | 0 {tutorial => demos/tutorial}/08_fbo.lolfx | 0 {tutorial => demos/tutorial}/08_fbo.vcxproj | 0 {tutorial => demos/tutorial}/11_fractal.cpp | 0 {tutorial => demos/tutorial}/11_fractal.lolfx | 0 .../tutorial}/11_fractal.vcxproj | 0 .../tutorial}/12_distance.lolfx | 0 .../tutorial}/12_texture_to_screen.lolfx | 0 {tutorial => demos/tutorial}/12_voronoi.cpp | 0 {tutorial => demos/tutorial}/12_voronoi.lolfx | 0 .../tutorial}/12_voronoi.vcxproj | 0 .../tutorial}/12_voronoi_distance.lolfx | 0 .../tutorial}/12_voronoi_setup.lolfx | 0 {tutorial => demos/tutorial}/Makefile.am | 0 35 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 demos/Makefile.am rename {tutorial => demos/tutorial}/01_triangle.cpp (100%) rename {tutorial => demos/tutorial}/01_triangle.lolfx (100%) rename {tutorial => demos/tutorial}/01_triangle.vcxproj (100%) rename {tutorial => demos/tutorial}/02_cube.cpp (100%) rename {tutorial => demos/tutorial}/02_cube.lolfx (100%) rename {tutorial => demos/tutorial}/02_cube.vcxproj (100%) rename {tutorial => demos/tutorial}/03_noise.cpp (100%) rename {tutorial => demos/tutorial}/03_noise.lolfx (100%) rename {tutorial => demos/tutorial}/03_noise.vcxproj (100%) rename {tutorial => demos/tutorial}/04_texture.cpp (100%) rename {tutorial => demos/tutorial}/04_texture.lolfx (100%) rename {tutorial => demos/tutorial}/04_texture.vcxproj (100%) rename {tutorial => demos/tutorial}/05_easymesh.cpp (100%) rename {tutorial => demos/tutorial}/05_easymesh.vcxproj (100%) rename {tutorial => demos/tutorial}/06_sprite.cpp (100%) rename {tutorial => demos/tutorial}/06_sprite.png (100%) rename {tutorial => demos/tutorial}/06_sprite.vcxproj (100%) rename {tutorial => demos/tutorial}/08_fbo.cpp (100%) rename {tutorial => demos/tutorial}/08_fbo.lolfx (100%) rename {tutorial => demos/tutorial}/08_fbo.vcxproj (100%) rename {tutorial => demos/tutorial}/11_fractal.cpp (100%) rename {tutorial => demos/tutorial}/11_fractal.lolfx (100%) rename {tutorial => demos/tutorial}/11_fractal.vcxproj (100%) rename {tutorial => demos/tutorial}/12_distance.lolfx (100%) rename {tutorial => demos/tutorial}/12_texture_to_screen.lolfx (100%) rename {tutorial => demos/tutorial}/12_voronoi.cpp (100%) rename {tutorial => demos/tutorial}/12_voronoi.lolfx (100%) rename {tutorial => demos/tutorial}/12_voronoi.vcxproj (100%) rename {tutorial => demos/tutorial}/12_voronoi_distance.lolfx (100%) rename {tutorial => demos/tutorial}/12_voronoi_setup.lolfx (100%) rename {tutorial => demos/tutorial}/Makefile.am (100%) diff --git a/Makefile.am b/Makefile.am index 300f9606..7322d1ab 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/build/autotools/common.am # Put "people" at the end because they're more likely to break builds. -SUBDIRS = build src tutorial test tools games people doc +SUBDIRS = build src test tools games demos people doc DIST_SUBDIRS = $(SUBDIRS) binaries EXTRA_DIST += bootstrap COPYING TODO diff --git a/build/vs2010/Lol.sln b/build/vs2010/Lol.sln index 1b3b949a..c07a8c4b 100644 --- a/build/vs2010/Lol.sln +++ b/build/vs2010/Lol.sln @@ -50,28 +50,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsuite", "..\..\test\tes EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tutorial", "Tutorial", "{E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "..\..\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "01_triangle", "..\..\demos\tutorial\01_triangle.vcxproj", "{B92ABADC-45BE-4CC5-B724-9426053123A1}" ProjectSection(ProjectDependencies) = postProject {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "..\..\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "02_cube", "..\..\demos\tutorial\02_cube.vcxproj", "{7B083DA2-FE08-4F6D-BFDD-195D5C2783EB}" ProjectSection(ProjectDependencies) = postProject {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05_easymesh", "..\..\tutorial\05_easymesh.vcxproj", "{1C5B8702-290C-42DA-AA9E-671348F5B747}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "05_easymesh", "..\..\demos\tutorial\05_easymesh.vcxproj", "{1C5B8702-290C-42DA-AA9E-671348F5B747}" ProjectSection(ProjectDependencies) = postProject {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} {D84021CA-B233-4E0F-8A52-071B83BBCCC4} = {D84021CA-B233-4E0F-8A52-071B83BBCCC4} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "11_fractal", "..\..\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "11_fractal", "..\..\demos\tutorial\11_fractal.vcxproj", "{6BF81B39-EDC2-4227-9992-C2D8ABEA95AF}" ProjectSection(ProjectDependencies) = postProject {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} = {9E62F2FE-3408-4EAE-8238-FD84238CEEDA} {83D3B207-C601-4025-8F41-01DEDC354661} = {83D3B207-C601-4025-8F41-01DEDC354661} @@ -110,7 +110,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "touky_demo", "..\..\people\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "btphystest", "..\..\test\btphystest.vcxproj", "{EE203B88-44CF-4859-9D42-7A1F43FECB52}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "..\..\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "08_fbo", "..\..\demos\tutorial\08_fbo.vcxproj", "{BCEE0132-8E24-49BE-AFEB-96DAD14396BA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Jnat", "Jnat", "{0A1651FC-322B-4B04-82CB-28E9046D9383}" EndProject @@ -124,7 +124,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Peeweek", "Peeweek", "{E27F EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "demo-peeweek", "..\..\people\peeweek\private\demo-peeweek.vcxproj", "{C2E01551-B636-4324-8461-71811DF6FBB5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03_noise", "..\..\tutorial\03_noise.vcxproj", "{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "03_noise", "..\..\demos\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 @@ -132,7 +132,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VsLol", "VsLol", "{9CC50C06 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VsLol", "..\..\tools\vslol\VsLol.csproj", "{58922993-9830-4A40-B462-0326342F69ED}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04_texture", "..\..\tutorial\04_texture.vcxproj", "{834852DB-EDB6-4FD0-BCF9-45CD01126962}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "04_texture", "..\..\demos\tutorial\04_texture.vcxproj", "{834852DB-EDB6-4FD0-BCF9-45CD01126962}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Benlitz", "Benlitz", "{B583BBFF-BE97-4F4E-BA1E-1F978A31EAB0}" EndProject @@ -142,13 +142,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "meshviewer", "..\..\test\me EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tactics", "..\..\people\touky\private\Tactics\tactics.vcxproj", "{25493FC8-75AC-4703-AD58-AB0C4A0FB79C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "12_Voronoi", "..\..\tutorial\12_Voronoi.vcxproj", "{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "12_Voronoi", "..\..\demos\tutorial\12_Voronoi.vcxproj", "{6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "the_unfortunate_voronoid", "..\..\people\touky\private\the_unfortunate_voronoid\the_unfortunate_voronoid.vcxproj", "{6BF81B39-EDC2-4127-9982-C2D8ABEA95AF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Lol.js", "Lol.js", "{430E9EC0-0E54-4BBB-BC31-3ECE04BAFCC5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol.js", "..\..\people\sam\private\lol.js\lol.js.vcxproj", "{AA376B9B-484B-4DC4-982F-6CFA645E441E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lol.js", "..\..\demos\lol.js\lol.js.vcxproj", "{AA376B9B-484B-4DC4-982F-6CFA645E441E}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/configure.ac b/configure.ac index 96956530..1325aef8 100644 --- a/configure.ac +++ b/configure.ac @@ -478,7 +478,6 @@ AC_CONFIG_FILES( src/lua/Makefile src/data/Makefile src/data/font/Makefile - tutorial/Makefile test/Makefile test/math/Makefile test/sandbox/Makefile @@ -487,6 +486,7 @@ AC_CONFIG_FILES( binaries/Makefile people/Makefile games/Makefile + demos/tutorial/Makefile tools/Makefile tools/vimlol/Makefile tools/vslol/Makefile @@ -509,6 +509,10 @@ AC_CONFIG_FILES( AC_CONFIG_FILES( [games/orbital/Makefile ]) +AC_CONFIG_FILES( + [demos/tutorial/Makefile + demos/lol.js/Makefile +]) AC_CONFIG_FILES( [tools/neercs/Makefile ]) @@ -529,7 +533,6 @@ AC_CONFIG_FILES( people/sam/Makefile people/sam/private/Makefile people/sam/private/kanagawa/Makefile - people/sam/private/lol.js/Makefile people/sam/private/sapp/Makefile ]) diff --git a/demos/Makefile.am b/demos/Makefile.am new file mode 100644 index 00000000..42157fcf --- /dev/null +++ b/demos/Makefile.am @@ -0,0 +1,7 @@ + +include $(top_srcdir)/build/autotools/common.am + +SUBDIRS = +SUBDIRS += lol.js +SUBDIRS += tutorial + diff --git a/tutorial/01_triangle.cpp b/demos/tutorial/01_triangle.cpp similarity index 100% rename from tutorial/01_triangle.cpp rename to demos/tutorial/01_triangle.cpp diff --git a/tutorial/01_triangle.lolfx b/demos/tutorial/01_triangle.lolfx similarity index 100% rename from tutorial/01_triangle.lolfx rename to demos/tutorial/01_triangle.lolfx diff --git a/tutorial/01_triangle.vcxproj b/demos/tutorial/01_triangle.vcxproj similarity index 100% rename from tutorial/01_triangle.vcxproj rename to demos/tutorial/01_triangle.vcxproj diff --git a/tutorial/02_cube.cpp b/demos/tutorial/02_cube.cpp similarity index 100% rename from tutorial/02_cube.cpp rename to demos/tutorial/02_cube.cpp diff --git a/tutorial/02_cube.lolfx b/demos/tutorial/02_cube.lolfx similarity index 100% rename from tutorial/02_cube.lolfx rename to demos/tutorial/02_cube.lolfx diff --git a/tutorial/02_cube.vcxproj b/demos/tutorial/02_cube.vcxproj similarity index 100% rename from tutorial/02_cube.vcxproj rename to demos/tutorial/02_cube.vcxproj diff --git a/tutorial/03_noise.cpp b/demos/tutorial/03_noise.cpp similarity index 100% rename from tutorial/03_noise.cpp rename to demos/tutorial/03_noise.cpp diff --git a/tutorial/03_noise.lolfx b/demos/tutorial/03_noise.lolfx similarity index 100% rename from tutorial/03_noise.lolfx rename to demos/tutorial/03_noise.lolfx diff --git a/tutorial/03_noise.vcxproj b/demos/tutorial/03_noise.vcxproj similarity index 100% rename from tutorial/03_noise.vcxproj rename to demos/tutorial/03_noise.vcxproj diff --git a/tutorial/04_texture.cpp b/demos/tutorial/04_texture.cpp similarity index 100% rename from tutorial/04_texture.cpp rename to demos/tutorial/04_texture.cpp diff --git a/tutorial/04_texture.lolfx b/demos/tutorial/04_texture.lolfx similarity index 100% rename from tutorial/04_texture.lolfx rename to demos/tutorial/04_texture.lolfx diff --git a/tutorial/04_texture.vcxproj b/demos/tutorial/04_texture.vcxproj similarity index 100% rename from tutorial/04_texture.vcxproj rename to demos/tutorial/04_texture.vcxproj diff --git a/tutorial/05_easymesh.cpp b/demos/tutorial/05_easymesh.cpp similarity index 100% rename from tutorial/05_easymesh.cpp rename to demos/tutorial/05_easymesh.cpp diff --git a/tutorial/05_easymesh.vcxproj b/demos/tutorial/05_easymesh.vcxproj similarity index 100% rename from tutorial/05_easymesh.vcxproj rename to demos/tutorial/05_easymesh.vcxproj diff --git a/tutorial/06_sprite.cpp b/demos/tutorial/06_sprite.cpp similarity index 100% rename from tutorial/06_sprite.cpp rename to demos/tutorial/06_sprite.cpp diff --git a/tutorial/06_sprite.png b/demos/tutorial/06_sprite.png similarity index 100% rename from tutorial/06_sprite.png rename to demos/tutorial/06_sprite.png diff --git a/tutorial/06_sprite.vcxproj b/demos/tutorial/06_sprite.vcxproj similarity index 100% rename from tutorial/06_sprite.vcxproj rename to demos/tutorial/06_sprite.vcxproj diff --git a/tutorial/08_fbo.cpp b/demos/tutorial/08_fbo.cpp similarity index 100% rename from tutorial/08_fbo.cpp rename to demos/tutorial/08_fbo.cpp diff --git a/tutorial/08_fbo.lolfx b/demos/tutorial/08_fbo.lolfx similarity index 100% rename from tutorial/08_fbo.lolfx rename to demos/tutorial/08_fbo.lolfx diff --git a/tutorial/08_fbo.vcxproj b/demos/tutorial/08_fbo.vcxproj similarity index 100% rename from tutorial/08_fbo.vcxproj rename to demos/tutorial/08_fbo.vcxproj diff --git a/tutorial/11_fractal.cpp b/demos/tutorial/11_fractal.cpp similarity index 100% rename from tutorial/11_fractal.cpp rename to demos/tutorial/11_fractal.cpp diff --git a/tutorial/11_fractal.lolfx b/demos/tutorial/11_fractal.lolfx similarity index 100% rename from tutorial/11_fractal.lolfx rename to demos/tutorial/11_fractal.lolfx diff --git a/tutorial/11_fractal.vcxproj b/demos/tutorial/11_fractal.vcxproj similarity index 100% rename from tutorial/11_fractal.vcxproj rename to demos/tutorial/11_fractal.vcxproj diff --git a/tutorial/12_distance.lolfx b/demos/tutorial/12_distance.lolfx similarity index 100% rename from tutorial/12_distance.lolfx rename to demos/tutorial/12_distance.lolfx diff --git a/tutorial/12_texture_to_screen.lolfx b/demos/tutorial/12_texture_to_screen.lolfx similarity index 100% rename from tutorial/12_texture_to_screen.lolfx rename to demos/tutorial/12_texture_to_screen.lolfx diff --git a/tutorial/12_voronoi.cpp b/demos/tutorial/12_voronoi.cpp similarity index 100% rename from tutorial/12_voronoi.cpp rename to demos/tutorial/12_voronoi.cpp diff --git a/tutorial/12_voronoi.lolfx b/demos/tutorial/12_voronoi.lolfx similarity index 100% rename from tutorial/12_voronoi.lolfx rename to demos/tutorial/12_voronoi.lolfx diff --git a/tutorial/12_voronoi.vcxproj b/demos/tutorial/12_voronoi.vcxproj similarity index 100% rename from tutorial/12_voronoi.vcxproj rename to demos/tutorial/12_voronoi.vcxproj diff --git a/tutorial/12_voronoi_distance.lolfx b/demos/tutorial/12_voronoi_distance.lolfx similarity index 100% rename from tutorial/12_voronoi_distance.lolfx rename to demos/tutorial/12_voronoi_distance.lolfx diff --git a/tutorial/12_voronoi_setup.lolfx b/demos/tutorial/12_voronoi_setup.lolfx similarity index 100% rename from tutorial/12_voronoi_setup.lolfx rename to demos/tutorial/12_voronoi_setup.lolfx diff --git a/tutorial/Makefile.am b/demos/tutorial/Makefile.am similarity index 100% rename from tutorial/Makefile.am rename to demos/tutorial/Makefile.am