summaryrefslogtreecommitdiffstats
path: root/o3d/samples/beachdemo
Commit message (Collapse)AuthorAgeFilesLines
* Moving o3d up a level, to get it out of chrome checkouts.bradnelson@google.com2011-03-2839-10702/+0
| | | | | | | | | | BUG=None TEST=None Too large for codereview. Manual review by thaloun and tschelcher. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79609 0039d316-1c4b-4281-b951-d872f2087c98
* Added setLanguage functions to canvas, fps and particles. Added ↵amarinichev@chromium.org2010-05-0620-103/+6311
| | | | | | | | beachdemo-glsl and its shaders. Review URL: http://codereview.chromium.org/1894001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46579 0039d316-1c4b-4281-b951-d872f2087c98
* Review URL: http://codereview.chromium.org/1736003amarinichev@chromium.org2010-04-2119-1098/+1624
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45262 0039d316-1c4b-4281-b951-d872f2087c98
* Fix beach demo strafe.gman@google.com2009-10-241-1/+1
| | | | | | Review URL: http://codereview.chromium.org/328019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29974 0039d316-1c4b-4281-b951-d872f2087c98
* Remove pack from calls to texture.getRenderSurfacegman@google.com2009-10-151-2/+2
| | | | | | | | as that has been deprecated. Review URL: http://codereview.chromium.org/274042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29070 0039d316-1c4b-4281-b951-d872f2087c98
* Update samples to use more utility functions wheregman@google.com2009-09-011-19/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriate. A few places used pseudoRandom. That is in math.js now so they use that. Other places there is now o3djs.material.createBasicMaterial and o3djs.material.createMaterialFromFile that save 10-20 lines per sample. This CL will require new reference images. There are 2 other things I'd like to consider. #1) Changing every sample that uses shaders/texture-only.shader to use o3djs.material.createConstantMaterial or some variation. The problem with o3djs.material.createConstantMaterial is it requires you pass it a texture if you want a constant textured material. All the samples create the material first, then later add the texture. So, I could add a new o3djs.material.createTextureOnlyMaterial. At the same time that would mean changing those samples from setting stuff on 'texSampler0' to 'emissive' #2) I'd like to change the shader builder so it stops adding "Sampler" to textured materials. As it is if the material uses a color it makes the param called "diffuse" but if it's a texture it makes it "diffuseSampler". That sucks because it means the code has to do crap like var param = material.getParam('diffuse'); if (param) { // it's a color } else { param = material.getParam('diffuseSampler'); if (param) { // it's a texture. } } If we stopped that silliness we could just do var param = material.getParam('diffuse'); if (param) { if (param.isA('o3d.ParamTexture')) { // it's textured. } else { // it's not. } } Unfortunately to fix this requires changing the o3dConverter as well since it uses those conventions. Should we do this? Review URL: http://codereview.chromium.org/182024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25015 0039d316-1c4b-4281-b951-d872f2087c98
* Change our selenium tests to call gman@google.com2009-07-081-0/+12
| | | | | | | | | window.o3d_prepForSelenium if it exists and fix becahdemo to use this feature. Review URL: http://codereview.chromium.org/155191 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20113 0039d316-1c4b-4281-b951-d872f2087c98
* Turning async loading off to get the beachdemo to work again in IE. This is ↵vangelis@google.com2009-07-031-2/+2
| | | | | | | | logged as issue #82. Once it's fixed, we should turn async loading back on. Review URL: http://codereview.chromium.org/155028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19864 0039d316-1c4b-4281-b951-d872f2087c98
* Fix scrollwheel in beachdemogman@google.com2009-07-021-1/+1
| | | | | | Review URL: http://codereview.chromium.org/149139 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19842 0039d316-1c4b-4281-b951-d872f2087c98
* Review URL: http://codereview.chromium.org/147258ericu@google.com2009-07-021-29/+101
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19795 0039d316-1c4b-4281-b951-d872f2087c98
* Make the beachdemo not require LargeGeometrygman@google.com2009-07-011-1/+1
| | | | | | Review URL: http://codereview.chromium.org/150153 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19769 0039d316-1c4b-4281-b951-d872f2087c98
* This is the O3D source tree's initial commit to the Chromium tree. It gspencer@google.com2009-05-275-0/+3891
is not built or referenced at all by the chrome build yet, and doesn't yet build in it's new home. We'll change that shortly. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17035 0039d316-1c4b-4281-b951-d872f2087c98