summaryrefslogtreecommitdiffstats
path: root/o3d/command_buffer/samples/bubble/perlin_noise.cc
diff options
context:
space:
mode:
authorgman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-12 23:43:23 +0000
committergman@google.com <gman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-12 23:43:23 +0000
commit18523d34bcd9ec0aa7b905a6af76ba1bfb278536 (patch)
tree350283fcd7f1b16d96bdf5a0bed5b7537df5de4a /o3d/command_buffer/samples/bubble/perlin_noise.cc
parenta6c49b5d15b0e96163473982e88bcac08c535ef1 (diff)
downloadchromium_src-18523d34bcd9ec0aa7b905a6af76ba1bfb278536.zip
chromium_src-18523d34bcd9ec0aa7b905a6af76ba1bfb278536.tar.gz
chromium_src-18523d34bcd9ec0aa7b905a6af76ba1bfb278536.tar.bz2
Make the bubble demo use the command buffer structs.
Please chime in on how you would like this changed. Issues *) should I delete the old nacl setup code? Basically I commented out the old NaCl initialization code and then copied the initialization code from big_test. My understanding is whatever the old way was is no longer current. If I don't delete the old code should I go through the trouble of separating the common code "bubble_demo" from the setup code? I'd prefer to just leave it as is and let someone who knows the nacl stuff better to fix it. *) How do I make it build correctly and also for gyp? Also I'm not sure how to build it correctly. The build.scons works but I get warnings like: scons: warning: Two different environments were specified for target cross\buffer_sync_proxy.obj, but they appear to have the same action: $CXX $_MSVC_OUTPUT_FLAG /c $CHANGED_SOURCES $CXXFLAGS $CCFLAGS $_CCCOMCOM File "C:\src\o3d_spud\o3d\site_scons\site_tools\component_builders.py", line 249, in ComponentLibrary Review URL: http://codereview.chromium.org/251052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/command_buffer/samples/bubble/perlin_noise.cc')
-rw-r--r--o3d/command_buffer/samples/bubble/perlin_noise.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/o3d/command_buffer/samples/bubble/perlin_noise.cc b/o3d/command_buffer/samples/bubble/perlin_noise.cc
index f69f527..2634edd 100644
--- a/o3d/command_buffer/samples/bubble/perlin_noise.cc
+++ b/o3d/command_buffer/samples/bubble/perlin_noise.cc
@@ -58,7 +58,7 @@ void PerlinNoise2D::Initialize(unsigned int *seed) {
// element. Also duplicate the permutation table so that constructs like
// permutation[x + permutation[y]] work without additional modulo.
for (unsigned int i = 0; i < frequency_; ++i) {
- unsigned int j = i + (rand_r(seed) % (frequency_ - i));
+ unsigned int j = i + (RandR(seed) % (frequency_ - i));
unsigned int tmp = permutation_[j];
permutation_[j] = permutation_[i];
permutation_[i] = tmp;