Changeset 2580Tweet

Timestamp:

Mar 12, 2013, 12:22:04 PM (10 years ago)

Author:

touky

Message:

12_voronoi : Added GPU Voronoi test.

Location:

trunk

Files:

• build/vs2010/Lol.sln (modified) (3 diffs)
• tutorial/12_distance.lolfx (added)
• tutorial/12_texture_to_screen.lolfx (added)
• tutorial/12_voronoi.cpp (added)
• tutorial/12_voronoi.lolfx (added)
• tutorial/12_voronoi.vcxproj (added)
• tutorial/12_voronoi_distance.lolfx (added)
• tutorial/12_voronoi_setup.lolfx (added)
• tutorial/Makefile.am (modified) (2 diffs)

trunk/build/vs2010/Lol.sln

@@ -142 +142 @@
 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}"
 EndProject
 Global
@@ -766 +768 @@
                 {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|x64.Build.0 = Release|x64
                 {25493FC8-75AC-4703-AD58-AB0C4A0FB79C}.Release|Xbox 360.ActiveCfg = Release|x64
+                {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Any CPU.ActiveCfg = Debug|x64
+                {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+                {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+                {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|PS3.ActiveCfg = Debug|x64
+                {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win32.ActiveCfg = Debug|Win32
+                {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Debug|Win32.Build.0 = 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}.Debug|Xbox 360.ActiveCfg = Debug|x64
+                {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Any CPU.ActiveCfg = Release|x64
+                {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+                {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|Mixed Platforms.Build.0 = Release|Win32
+                {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF}.Release|PS3.ActiveCfg = Release|x64
+                {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-4227-9982-C2D8ABEA95AF}.Release|Xbox 360.ActiveCfg = Release|x64
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
@@ -797 +817 @@
                 {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
                 {834852DB-EDB6-4FD0-BCF9-45CD01126962} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
+                {6BF81B39-EDC2-4227-9982-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
                 {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46}
                 {EE203B88-44CF-4859-9D42-7A5F40FECB52} = {8C77EAA8-1077-4EF7-AE53-97C6C60A3601}

trunk/tutorial/Makefile.am

@@ -3 +3 @@
 
 noinst_PROGRAMS = 01_triangle 02_cube 03_noise 04_texture 05_easymesh \
-                  08_fbo 11_fractal
+                  08_fbo 11_fractal \
+                  12_fractal
 
 01_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
@@ -33 +34 @@
 11_fractal_DEPENDENCIES = @LOL_DEPS@
 
+12_voronoi_SOURCES = 12_voronoi.cpp 12_voronoi.lolfx \
+                     12_voronoi_distance.lolfx 12_voronoi_setup.lolfx \
+                     12_texture_to_screen.lolfx 12_distance.lolfx
+12_voronoi_CPPFLAGS = $(AM_CPPFLAGS)
+12_voronoi_DEPENDENCIES = @LOL_DEPS@
+