[Copter-cvs] tools/terraingen main.cpp,1.1,1.2 midpoint.hpp,1.1,1.2

[Chong K. X. <des...@us...>]

Update of /cvsroot/copter/tools/terraingen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25997

Modified Files:
	main.cpp midpoint.hpp 
Log Message:

* main.cpp: add smoothness parameter to midpoint_displace_generate().
* midpoint.hpp: Fix syntax error with braces, add smoothness parameter.


Index: midpoint.hpp
===================================================================
RCS file: /cvsroot/copter/tools/terraingen/midpoint.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** midpoint.hpp	14 Apr 2005 08:31:16 -0000	1.1
--- midpoint.hpp	14 Apr 2005 08:57:29 -0000	1.2
***************
*** 23,27 ****
      public:
  
!         MidpointDisplace()
          {}
  
--- 23,28 ----
      public:
  
!         MidpointDisplace(T smoothness)
!             : m_smoothness(smoothness)
          {}
  
***************
*** 84,88 ****
              if ((z = map(x, y)) < 0)
              {
!                 dz = ((x1 - x0) * (Random::norm<T>() - 0.5)) / map.get_width();
                  z = clamp<T>((map(x0, y) + map(x1, y)) / 2 + dz, 0, 1);
                  
--- 85,89 ----
              if ((z = map(x, y)) < 0)
              {
!                 dz = ((x1 - x0) * m_smoothness * (Random::norm<T>() - 0.5)) / map.get_width();
                  z = clamp<T>((map(x0, y) + map(x1, y)) / 2 + dz, 0, 1);
                  
***************
*** 102,119 ****
              if ((z = map(x, y)) < 0)
              {
!                 dz = ((y1 - y0) * (Random::norm<T>() - 0.5)) / map.get_height();
                  z = clamp<T>((map(x, y0) + map(x, y1)) / 2 + dz, 0, 1);
                  
                  map(x, y) = z;
              }
          }
  
-         return z;
-     }
- 
- 
- 
      private:
  
          void 
          set_random_height(Map<T>& map,
--- 103,119 ----
              if ((z = map(x, y)) < 0)
              {
!                 dz = ((y1 - y0) * m_smoothness * (Random::norm<T>() - 0.5)) / map.get_height();
                  z = clamp<T>((map(x, y0) + map(x, y1)) / 2 + dz, 0, 1);
                  
                  map(x, y) = z;
              }
+             
+             return z;
          }
  
      private:
  
+         T m_smoothness;
+ 
          void 
          set_random_height(Map<T>& map,

Index: main.cpp
===================================================================
RCS file: /cvsroot/copter/tools/terraingen/main.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** main.cpp	14 Apr 2005 08:31:15 -0000	1.1
--- main.cpp	14 Apr 2005 08:57:29 -0000	1.2
***************
*** 95,107 ****
  
  template <typename T>
! void fault_generate(Terrain::Map<T>& map, int n_faults, T depth)
  {
!     Terrain::Fault<T>(n_faults, depth)(map);
  }
  
  template <typename T>
! void midpoint_displace_generate(Terrain::Map<T>& map)
  {
!     Terrain::MidpointDisplace<T>()(map);
  }
  
--- 95,111 ----
  
  template <typename T>
! void fault_generate(Terrain::Map<T>& map,
!                     int n_faults, T depth)
  {
!     Terrain::Fault<T> generate(n_faults, depth);
!     generate(map);
  }
  
  template <typename T>
! void midpoint_displace_generate(Terrain::Map<T>& map,
!                                 T smoothness)
  {
!     Terrain::MidpointDisplace<T> generate(smoothness);
!     generate(map);
  }
  
***************
*** 118,127 ****
  
      Terrain::Map<float> map(256, 256);
!     midpoint_displace_generate(map);
      //fault_generate(map, 1000, 1.0f);
      map.scale_fit(-1, 1);
  
- 
- 
      save_to_file("terrain.dat", map);
  
--- 122,129 ----
  
      Terrain::Map<float> map(256, 256);
!     midpoint_displace_generate(map, 5.0f);
      //fault_generate(map, 1000, 1.0f);
      map.scale_fit(-1, 1);
  
      save_to_file("terrain.dat", map);