Changeset 1824Tweet

Timestamp:

Aug 27, 2012, 2:16:58 PM (8 years ago)

Author:

sam

Message:

tutorial: start working on a small Perlin-like noise demo.

Location:

trunk

Files:

• .gitignore (modified) (1 diff)
• build/vs2010/Lol.sln (modified) (3 diffs)
• tutorial/03_noise.cpp (added)
• tutorial/03_noise.lolfx (added)
• tutorial/03_noise.vcxproj (added)
• tutorial/Makefile.am (modified) (2 diffs)

trunk/.gitignore

@@ -73 +73 @@
 tutorial/01_triangle
 tutorial/02_cube
+tutorial/03_noise
 tutorial/05_easymesh
 tutorial/08_fbo

trunk/build/vs2010/Lol.sln

@@ -105 +105 @@
 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", "..\..\tutorial\03_noise.vcxproj", "{B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}"
 EndProject
 Global
@@ -446 +448 @@
                 {C2E01551-B636-4324-8461-71811DF6FBB5}.Release|Xbox 360.Build.0 = Release|Xbox 360
                 {C2E01551-B636-4324-8461-71811DF6FBB5}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
+                {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|PS3.ActiveCfg = Debug|PS3
+                {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|PS3.Build.0 = Debug|PS3
+                {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win32.ActiveCfg = Debug|Win32
+                {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Win32.Build.0 = 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}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
+                {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
+                {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Debug|Xbox 360.Deploy.0 = Debug|Xbox 360
+                {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|PS3.ActiveCfg = Release|PS3
+                {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|PS3.Build.0 = Release|PS3
+                {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
+                {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
+                {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Xbox 360.Build.0 = Release|Xbox 360
+                {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E}.Release|Xbox 360.Deploy.0 = Release|Xbox 360
         EndGlobalSection
         GlobalSection(SolutionProperties) = preSolution
@@ -471 +491 @@
                 {1C5B8702-290C-42DA-AA9E-671348F5B747} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
                 {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
+                {BCEE0132-8E24-49BE-AFEB-96DAD14396BA} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
+                {B0A53D75-CBB4-4FDF-93AC-2D12A79ADA0E} = {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

@@ -15 +15 @@
         $(LOLFX_BUILD)
 
-noinst_PROGRAMS = 01_triangle 02_cube 05_easymesh 08_fbo 11_fractal
+noinst_PROGRAMS = 01_triangle 02_cube 03_noise 05_easymesh 08_fbo 11_fractal
 
 01_triangle_SOURCES = 01_triangle.cpp 01_triangle.lolfx
@@ -26 +26 @@
 02_cube_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
 02_cube_DEPENDENCIES = $(top_builddir)/src/liblol.a
+
+03_noise_SOURCES = 03_noise.cpp 03_noise.lolfx
+03_noise_CPPFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
+03_noise_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
+03_noise_DEPENDENCIES = $(top_builddir)/src/liblol.a
 
 05_easymesh_SOURCES = 05_easymesh.cpp