summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* Making it possible to run scons on vista using VS2008 without having to ↵vangelis@google.com2009-07-102-5/+15
| | | | | | | | install an additional MS SDK. VS2008 does come with SDK version 6.0, it's just that the registry entries for it are slightly different than in XP. This change takes care of Vista but I'm not sure what the registry looks like in Windows XP when you install VS 2008. Review URL: http://codereview.chromium.org/155326 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20356 0039d316-1c4b-4281-b951-d872f2087c98
* fix for osxgman@google.com2009-07-101-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20346 0039d316-1c4b-4281-b951-d872f2087c98
* Add ClientInfogman@google.com2009-07-0919-15/+477
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows an app to ask a few things from the client. 1) How many objects the client is tracking. This is useful for a quick way to check that you're freeing resources. While the developer could use client.objects.length or client.packs[ii].objects.length that wouldend up creating hundreds of thousands of NPObjects. 2) Check if the software renderer is being used 3) Check the approximate amount of memory used by textures. Again, they could compute this with client.getObjectsByClassName('o3d.Texture') but it seemed like it might be useful. I say approximate because I would have to dig down into the indivdual renderers to get better info since a NPOT card will use more memory but it didn't seem worth it. 4) check the approximate amount of memory used by hardware buffers. Review URL: http://codereview.chromium.org/155276 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20334 0039d316-1c4b-4281-b951-d872f2087c98
* Explicitly specify -rfakeroot to dpkg-buildpackage, since that is only the ↵tschmelcher@google.com2009-07-091-1/+1
| | | | | | | | default in relatively new versions. Review URL: http://codereview.chromium.org/155319 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20322 0039d316-1c4b-4281-b951-d872f2087c98
* linux: bump deps to get the fcollada fix, add -ldl necessary on some platformspiman@google.com2009-07-092-2/+2
| | | | | | | Review URL: http://codereview.chromium.org/149403 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20307 0039d316-1c4b-4281-b951-d872f2087c98
* In preparation for becoming an internal plugin in chrome I did these things:apatrick@google.com2009-07-0917-1205/+1294
| | | | | | | | | | | - Move declarations in the global namespace into the o3d namespace to avoid conflicts with Chrome. - Ifdef out code that we do not want to run as an internal plugin (like breakpad, DllMain, etc) - Prevent NP_Initialize, etc from being exported as an internal plugin. Unfortunately I had to move functions around to group them by namespace so the diffs look like there is more change than there actually is. Review URL: http://codereview.chromium.org/149130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20285 0039d316-1c4b-4281-b951-d872f2087c98
* Fix bug with render targets not getting restored correctly.gman@google.com2009-07-081-0/+2
| | | | | | Review URL: http://codereview.chromium.org/155185 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20117 0039d316-1c4b-4281-b951-d872f2087c98
* Add missing Param IDL for ParamRenderSurface andgman@google.com2009-07-082-45/+68
| | | | | | | | ParamRenderDepthStencilSurface. Review URL: http://codereview.chromium.org/149298 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20116 0039d316-1c4b-4281-b951-d872f2087c98
* These files were meant to be checked in with gman@google.com2009-07-083-10/+17
| | | | | | | | | | | http://codereview.chromium.org/149236 The change SourceBuffer to use scoped_array and they add a test for Class::unqualified_name. Review URL: http://codereview.chromium.org/149300 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20115 0039d316-1c4b-4281-b951-d872f2087c98
* Change dump.js to show render nodes sorted by priority.gman@google.com2009-07-081-1/+11
| | | | | | Review URL: http://codereview.chromium.org/149297 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20114 0039d316-1c4b-4281-b951-d872f2087c98
* Change our selenium tests to call gman@google.com2009-07-083-12/+28
| | | | | | | | | 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
* Removing unneeded EffectStream class. Cleaning up data assignment for stream ↵rlp@google.com2009-07-084-19/+6
| | | | | | | | info. Updating the main.scons so that cb can build. Review URL: http://codereview.chromium.org/155188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20106 0039d316-1c4b-4281-b951-d872f2087c98
* Enable build dependency checking for dpkg-buildpackage so that we get a ↵tschmelcher@google.com2009-07-071-1/+1
| | | | | | | | better error if there are missing dependencies. (I thought this was on by default already, but it turns out that adding -a turns it off by default.) Review URL: http://codereview.chromium.org/149275 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20074 0039d316-1c4b-4281-b951-d872f2087c98
* Adding toon.shader to the samples MANIFESTvangelis@google.com2009-07-071-0/+1
| | | | | | Review URL: http://codereview.chromium.org/155125 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20063 0039d316-1c4b-4281-b951-d872f2087c98
* Re-enabling features-test.html for IE. The test was fixed in rev 19867vangelis@google.com2009-07-071-1/+1
| | | | | | Review URL: http://codereview.chromium.org/155031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20061 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for shader-test.html and IEgman@google.com2009-07-071-4/+5
| | | | | | | | | | | | | | | | Issue #1) creating HTML by string is fast in all browsers. Creating HTML by DOM methods is extremely slow in IE. 100-300x slower. http://www.quirksmode.org/dom/innerhtml.html Issue #2) There's a bug in IE related to <select> tags. http://support.microsoft.com/kb/276228 Review URL: http://codereview.chromium.org/155154 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20059 0039d316-1c4b-4281-b951-d872f2087c98
* Initial support for Linux installers. Currently just an amd64 .deb, but more ↵tschmelcher@google.com2009-07-0710-0/+318
| | | | | | | | later. Review URL: http://codereview.chromium.org/149132 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20051 0039d316-1c4b-4281-b951-d872f2087c98
* Add o3djs.DestinationBuffer to converter.gman@google.com2009-07-0715-53/+517
| | | | | | | | | I named it o3djs.DestinationBuffer because it has nothing to do with O3D. It's purely part of our sample serialization example. Review URL: http://codereview.chromium.org/149236 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20013 0039d316-1c4b-4281-b951-d872f2087c98
* Worked around infinite loop seen in Chrome on Windows when raising andkbr@google.com2009-07-071-0/+4
| | | | | | | | dismissing JavaScript alert over O3D view Review URL: http://codereview.chromium.org/155119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20002 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing test to get it to work in IEvangelis@google.com2009-07-031-1/+1
| | | | | | Review URL: http://codereview.chromium.org/150075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19867 0039d316-1c4b-4281-b951-d872f2087c98
* Bumping up the pdiff threshold for beach demo mac by 200 pixels to fix ↵vangelis@google.com2009-07-031-1/+1
| | | | | | | | failing pulse test. Review URL: http://codereview.chromium.org/149147 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19865 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
* Fixing the check for offscreen. If the variable doesn't exist, then the ↵rlp@google.com2009-07-031-1/+1
| | | | | | | | function will return 0 and off_screen should be false. Review URL: http://codereview.chromium.org/149157 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19863 0039d316-1c4b-4281-b951-d872f2087c98
* Adding GetStreamInfo functionality (and passing corresponding unit test).rlp@google.com2009-07-0213-5/+384
| | | | | | Review URL: http://codereview.chromium.org/147237 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19859 0039d316-1c4b-4281-b951-d872f2087c98
* Review URL: http://codereview.chromium.org/155005ericu@google.com2009-07-024-0/+2428
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19854 0039d316-1c4b-4281-b951-d872f2087c98
* Version number bump for releasegspencer@google.com2009-07-021-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19851 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-024-30/+298
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19795 0039d316-1c4b-4281-b951-d872f2087c98
* Add a dependency to the Mac installer build stage so that the postflight.sh ↵maf@google.com2009-07-021-3/+4
| | | | | | | | script always gets processed before it tries to build the installer than needs it. Review URL: http://codereview.chromium.org/150184 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19793 0039d316-1c4b-4281-b951-d872f2087c98
* Adding in most of the unit tests. This adds 406 of our unit testsgspencer@google.com2009-07-0113-113/+176
| | | | | | | | | into the gyp build. 21 of them fail, but that is only because they don't have test input yet -- I haven't added the build code that copies the test inputs into the build dir yet. Review URL: http://codereview.chromium.org/147129 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19778 0039d316-1c4b-4281-b951-d872f2087c98
* Make the beachdemo not require LargeGeometrygman@google.com2009-07-013-3/+3
| | | | | | Review URL: http://codereview.chromium.org/150153 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19769 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for Windows 7gman@google.com2009-07-013-5/+6
| | | | | | Review URL: http://codereview.chromium.org/150182 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19764 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing EffectTest.LogOpenGLCalls and cleaning up a line in DrawPassTest.rlp@google.com2009-07-012-5/+7
| | | | | | Review URL: http://codereview.chromium.org/150089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19749 0039d316-1c4b-4281-b951-d872f2087c98
* This updates python to the same version as Chrome uses, to fix a problemgspencer@google.com2009-07-011-1/+1
| | | | | | | with python crashing on Vista and Windows 7. Review URL: http://codereview.chromium.org/150170 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19741 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Mac installer build. We were not inserting the version number into the ↵maf@google.com2009-06-301-2/+4
| | | | | | | | Keystone registration script, which gave it a bogus registered version that caused a silent update once a day. Review URL: http://codereview.chromium.org/151106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19678 0039d316-1c4b-4281-b951-d872f2087c98
* Review URL: http://codereview.chromium.org/151103apatrick@google.com2009-06-305-20/+18
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19663 0039d316-1c4b-4281-b951-d872f2087c98
* Disabling beachdemo selenium test in Chrome.apatrick@google.com2009-06-301-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19662 0039d316-1c4b-4281-b951-d872f2087c98
* Forgot these 2 files in the last checkingman@google.com2009-06-302-8/+8
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19661 0039d316-1c4b-4281-b951-d872f2087c98
* This CL contains the the changes needed to buildgman@google.com2009-06-309-125/+2343
| | | | | | | | | | an externs file for the JSCompiler as well as the code to build a compiled verison of the o3djs sample libs. Review URL: http://codereview.chromium.org/147079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19659 0039d316-1c4b-4281-b951-d872f2087c98
* Some minor JS fixesgman@google.com2009-06-301-7/+19
| | | | | | Review URL: http://codereview.chromium.org/150131 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19658 0039d316-1c4b-4281-b951-d872f2087c98
* Disabled a couple of selenium tests that don't work in Chrome (see comment). ↵apatrick@google.com2009-06-302-3/+8
| | | | | | | | Set some members to NULL when Client::TearDown. Review URL: http://codereview.chromium.org/147185 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19655 0039d316-1c4b-4281-b951-d872f2087c98
* Made CHostControl use atomic reference counting because it is accessed from ↵apatrick@google.com2009-06-301-1/+3
| | | | | | | | StreamOperation threads. Review URL: http://codereview.chromium.org/151096 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19635 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a few more doc errors.gman@google.com2009-06-303-4/+12
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19575 0039d316-1c4b-4281-b951-d872f2087c98
* Review URL: http://codereview.chromium.org/149101ericu@google.com2009-06-301-0/+32
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19574 0039d316-1c4b-4281-b951-d872f2087c98
* Fix a minor doc issue in fps.jsgman@google.com2009-06-301-0/+1
| | | | | | Review URL: http://codereview.chromium.org/151062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19571 0039d316-1c4b-4281-b951-d872f2087c98
* Fix particle sample for IEgman@google.com2009-06-301-3/+3
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19566 0039d316-1c4b-4281-b951-d872f2087c98
* Add param-array-test to seleniumgman@google.com2009-06-303-3/+3
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19563 0039d316-1c4b-4281-b951-d872f2087c98
* Added particle trails for things like exhaust on a car.gman@google.com2009-06-293-85/+429
| | | | | | Review URL: http://codereview.chromium.org/125189 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19549 0039d316-1c4b-4281-b951-d872f2087c98
* Add support for Param Arrays for Effect parameters.gman@google.com2009-06-297-101/+1086
| | | | | | | | | | | | Arrays of floats, float2, float3, float4, Matrix4, int, bool and sampler are all supported. I'll enable the test for selenium and check in a screenshot in another build. Review URL: http://codereview.chromium.org/125188 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19548 0039d316-1c4b-4281-b951-d872f2087c98
* linux: fix build. don't use GDK_META_MASK until we figure out which version ↵piman@google.com2009-06-291-0/+5
| | | | | | of GTK to check for git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19547 0039d316-1c4b-4281-b951-d872f2087c98