summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* Fix files with svn:executable permissions.thestig@chromium.org2010-06-233-0/+0
| | | | | | | BUG=none TEST=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50566 0039d316-1c4b-4281-b951-d872f2087c98
* Review URL: http://codereview.chromium.org/2849014petersont@google.com2010-06-181-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50183 0039d316-1c4b-4281-b951-d872f2087c98
* Adding instancing and render target demos. luchen@google.com2010-06-179-2/+1839
| | | | | | | | Note: json scene for yard.o3dtgz; replaced this with teapot. (How much effort does it take to generate yard json scene?) Also, the instancing demos run sluggishly. (Limitation of JS?) Review URL: http://codereview.chromium.org/2714013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50158 0039d316-1c4b-4281-b951-d872f2087c98
* o3d-webgl: Adding WebGL version of the pingpong game.luchen@google.com2010-06-173-0/+846
| | | | | | Review URL: http://codereview.chromium.org/2857002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50156 0039d316-1c4b-4281-b951-d872f2087c98
* o3d-webgl: adding billboard demo.luchen@google.com2010-06-173-0/+401
| | | | | | Review URL: http://codereview.chromium.org/2863001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50155 0039d316-1c4b-4281-b951-d872f2087c98
* o3d-webgl: adding generate-texture demo, with implementation of texture.set.luchen@google.com2010-06-172-37/+341
| | | | | | Review URL: http://codereview.chromium.org/2821004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50154 0039d316-1c4b-4281-b951-d872f2087c98
* Got the yard and seven_shapes models to convert to pure-json. This would ↵petersont@google.com2010-06-172-18/+39
| | | | | | | | have been trivial, it turns out, except one little bug where if there weren't other files mentioned in the json, it didn't finish loading. Added some comments to smooth things over. Review URL: http://codereview.chromium.org/2861004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50138 0039d316-1c4b-4281-b951-d872f2087c98
* o3d-webgl: vertex shader and vertex animation demos.luchen@google.com2010-06-163-0/+637
| | | | | | Review URL: http://codereview.chromium.org/2821003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50006 0039d316-1c4b-4281-b951-d872f2087c98
* Modified the function o3djs.quaternions.rotationToQuaternion() to address a ↵petersont@google.com2010-06-162-8/+44
| | | | | | | | | bug where the identity matrix was generating a bad quaternion. bug = http://code.google.com/p/o3d/issues/detail?id=224 Review URL: http://codereview.chromium.org/2822006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49872 0039d316-1c4b-4281-b951-d872f2087c98
* Guard against the plugin being deleted unexpectedly.kbr@google.com2010-06-164-2/+27
| | | | | | | | | BUG=none TEST=manually stress tested plugin creation and destruction Review URL: http://codereview.chromium.org/2848004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49869 0039d316-1c4b-4281-b951-d872f2087c98
* Do not init v8 on platforms where it is not supported. maf@google.com2010-06-151-4/+9
| | | | | | | Prevents hang on Safari 5/Mac OS X 10.6. Review URL: http://codereview.chromium.org/2866003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49860 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed problems with Cocoa full-screen code:kbr@google.com2010-06-153-7/+32
| | | | | | | | | | | | | | | | | | | - Squelch mouse-up events coming from the browser while in full-screen mode. This avoids immediately falling out of full-screen mode in apps which have an icon which toggles between full-screen and windowed mode. - Squelch focus transfer events coming from the browser while in full-screen mode. This avoids immediately falling out of full-screen mode upon entry in some situations. Focus transfers away from the full-screen window continue to work. BUG=none TEST=various full-screen tests Review URL: http://codereview.chromium.org/2837006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49859 0039d316-1c4b-4281-b951-d872f2087c98
* Fix issue in Safari 5 on Mac OS X 10.6 on Mac Minis where ↵tschmelcher@chromium.org2010-06-151-7/+9
| | | | | | | | | | | drawInCGLContext/copyCGLContextForPixelFormat are called a second time during shutdown in certain hosting pages, causing an assert due to duplicate creation of the Renderer service. TEST=repeatedly launched/exiting the affected O3D app and verified no crash or other issue BUG=none Review URL: http://codereview.chromium.org/2740011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49835 0039d316-1c4b-4281-b951-d872f2087c98
* Roll forward NaCl version to pick up recent fixes. This should fixkbr@google.com2010-06-151-1/+1
| | | | | | | | | | | O3D's Windows and Linux builds. BUG=none TEST=none Review URL: http://codereview.chromium.org/2808004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49833 0039d316-1c4b-4281-b951-d872f2087c98
* Provide a default definition of the target_arch variable on Linux tokbr@google.com2010-06-151-0/+7
| | | | | | | | | | | | | | | work around a problem in NaCl's GYP files where it infers 32-bit on Linux in native_client/build/common.gypi. A fix in Native Client and a DEPS roll in O3D are still needed to make the Linux build fully work with the newer NaCl. BUG=none TEST=built O3D on Linux Review URL: http://codereview.chromium.org/2851003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49817 0039d316-1c4b-4281-b951-d872f2087c98
* Adding render-mode demo. Update to client.js to render only if render mode ↵luchen@google.com2010-06-152-2/+290
| | | | | | | | is continuous. Review URL: http://codereview.chromium.org/2729016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49752 0039d316-1c4b-4281-b951-d872f2087c98
* Rolled forward DEPS again to pick up NaCl IMC build fix on Mac OS X.kbr@google.com2010-06-111-1/+1
| | | | | | | | | | BUG=none TEST=built O3D release mode on Mac OS X TBR=vangelis Review URL: http://codereview.chromium.org/2758009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49615 0039d316-1c4b-4281-b951-d872f2087c98
* Rolled forward NaCl dependency to pick up IMC bug fix.kbr@google.com2010-06-111-1/+1
| | | | | | | | | BUG=none TEST=built and tested on Mac OS X Review URL: http://codereview.chromium.org/2790013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49610 0039d316-1c4b-4281-b951-d872f2087c98
* Adding handlers to zoom in/out on scrollwheel event.luchen@google.com2010-06-093-8/+47
| | | | | | | | | | Questions: - Is deltaY the correct field in which to store this event value? - Is the 'wheel' addEventListener hook broken in the first place? Doesn't work for me on OSX, but might be working in Windows/Linux and don't know if this change would break it for those. - It is necessary to cancel event bubbling for the onmousewheel event? Review URL: http://codereview.chromium.org/2456004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49305 0039d316-1c4b-4281-b951-d872f2087c98
* Adding wireframe light indicator to shadow map demo.luchen@google.com2010-06-093-11/+11
| | | | | | Review URL: http://codereview.chromium.org/2718003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49304 0039d316-1c4b-4281-b951-d872f2087c98
* Adding debugging demo to o3d-webgl collection. Includes minor bug fix in ↵luchen@google.com2010-06-086-52/+319
| | | | | | | | param_object (removeFromArray fails because collection is an object, not an array). Review URL: http://codereview.chromium.org/2716001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49192 0039d316-1c4b-4281-b951-d872f2087c98
* Adding support for pointlist, linelist, linestrip, trianglestrip and ↵luchen@google.com2010-06-083-5/+423
| | | | | | | | triangelfan primitive drawing types. Demo file included. Review URL: http://codereview.chromium.org/2645003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49173 0039d316-1c4b-4281-b951-d872f2087c98
* Converted four more demo files to o3d-webgl: juggler, sobel, julia and ↵luchen@google.com2010-06-074-0/+1351
| | | | | | | | texturesamplers. Review URL: http://codereview.chromium.org/2690002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49101 0039d316-1c4b-4281-b951-d872f2087c98
* Adding WebGL-ized rotatemodel.html demo.luchen@google.com2010-06-031-0/+250
| | | | | | Review URL: http://codereview.chromium.org/2483002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48869 0039d316-1c4b-4281-b951-d872f2087c98
* Porting the Phong Shader demo to WebGL.luchen@google.com2010-06-031-0/+345
| | | | | | Review URL: http://codereview.chromium.org/2503001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48868 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: include -g for Release builds to aid debugging. There is no downside ↵tschmelcher@chromium.org2010-06-021-0/+4
| | | | | | | | | | | because it does not affect what we ship. BUG=none TEST=built on Linux; verified no significant change in shipped file size Review URL: http://codereview.chromium.org/2439005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48778 0039d316-1c4b-4281-b951-d872f2087c98
* Prevent Client::Tick() from causing reentrancy in the plugin on Mac OS X.kbr@google.com2010-06-023-3/+16
| | | | | | | | | | | Tested with client application. BUG=none TEST=none Review URL: http://codereview.chromium.org/2451002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48770 0039d316-1c4b-4281-b951-d872f2087c98
* Adding WebGL-ified version of the customcamera.html demo.luchen@google.com2010-06-021-0/+456
| | | | | | Review URL: http://codereview.chromium.org/2439003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48682 0039d316-1c4b-4281-b951-d872f2087c98
* Until we work out why V8 refuses to work on the Safari/10.6 combination, ↵maf@google.com2010-05-291-0/+24
| | | | | | | | | ignore attempts to select the V8 engine on that config. This makes everything work. w00t! Review URL: http://codereview.chromium.org/2361003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48549 0039d316-1c4b-4281-b951-d872f2087c98
* Fix build break with gcc 4.4.1. (std::strcat not defined.)zhurunz@google.com2010-05-281-0/+2
| | | | | | | | | | | | | | | | | std::strcat has been moved into <cstring> As we seen before, ChromeOS gentoo build uses GCC 4.4.1 Since 4.3 release, there are a bunch of updates in GCC. Some of these changes are result of bug fixing, and some old behaviors have been intentionally changed in order to support new standards. The build breaks we have seen are mostly coming from the following cases: 1. Header dependency cleanup 2. Removal of Pre-ISO headers 3. Stricter requirements for function main signature See http://gcc.gnu.org/gcc-4.3/porting_to.html for details. Review URL: http://codereview.chromium.org/2343003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48537 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Fix bug that has always existed in the GYP build where O3D.rsrc was an ↵tschmelcher@chromium.org2010-05-281-0/+2
| | | | | | | | | | | empty file with all the data stored in the resource fork (which is lost when zipping). -useDF was in the ancient scons build but was never included in the GYP command. TEST=built on Mac, verified O3D.rsrc file is now correct, and verified it works in various browsers BUG=none Review URL: http://codereview.chromium.org/2384003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48524 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed bug in Core Graphics backend where it was falling through to thekbr@google.com2010-05-284-32/+48
| | | | | | | | | | | | | | AGL initialization code path in some situations, causing full-screen mode (at least) to break. Also fixed bug causing plugin to become reentrant during event dispatching. BUG=none TEST=none TBR=maf Review URL: http://codereview.chromium.org/2339002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48513 0039d316-1c4b-4281-b951-d872f2087c98
* In some circumstances the O3D plugin is briefly resized to zero height,kbr@google.com2010-05-281-1/+1
| | | | | | | | | | | | | | causing the Core Graphics rendering backend to request a zero-height render target. base::bits::Log2Ceiling returns -1 for a zero input which was being translated to a huge unsigned integer value, leading to an assertion failure. Verified with submitter's use case. BUG=none TEST=none Review URL: http://codereview.chromium.org/2377002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48507 0039d316-1c4b-4281-b951-d872f2087c98
* Sync to latest breakpad which doesn't have deps on libglog.zhurunz@google.com2010-05-282-10/+1
| | | | | | Review URL: http://codereview.chromium.org/2354001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48506 0039d316-1c4b-4281-b951-d872f2087c98
* Accepted mouse moved events in NSWindow used for Cocoa full-screen code path.kbr@google.com2010-05-281-0/+1
| | | | | | | | | | | Verified with manipulators sample modified to support full-screen. BUG=http://code.google.com/p/o3d/issues/detail?id=222 TEST=none Review URL: http://codereview.chromium.org/2347001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48452 0039d316-1c4b-4281-b951-d872f2087c98
* Changed how checkers sample identifies whether a hit occurred usingkbr@google.com2010-05-281-2/+4
| | | | | | | | | | | | | | | clientId rather than object equality. In both Safari and Chrome, if the browser's JavaScript engine is used rather than O3D's embedded V8, these equality comparisons fail. It looks like we may need to disable the use of the embedded V8 for this sample due to bad interactions with event dispatching. BUG=none TEST=none Review URL: http://codereview.chromium.org/2334001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48451 0039d316-1c4b-4281-b951-d872f2087c98
* Refactored drawing and event model selection to generalize to morekbr@google.com2010-05-264-101/+72
| | | | | | | | | | | | | | | | | | | | | | | browsers. Tested in the following browsers / operating systems: Mac OS X 10.5: - Safari (QuickDraw drawing model) - Firefox 3.6 (QuickDraw drawing model) - Firefox 2.0.0.20 (QuickDraw drawing model) - Modified Chromium TOT (Core Graphics drawing model) Mac OS X 10.6: - Safari (Core Animation drawing model) - Firefox 3.6.3 (QuickDraw drawing model) - Modified Chromium TOT (Core Animation drawing model) BUG=none TEST=none Review URL: http://codereview.chromium.org/2169002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48236 0039d316-1c4b-4281-b951-d872f2087c98
* Some texture parameters were being set in the pack when the texture was ↵petersont@google.com2010-05-242-97/+210
| | | | | | | | created by calling pack.createTexture2D or pack.createTextureCUBE. Moved that code into Texture class. Review URL: http://codereview.chromium.org/2117003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48078 0039d316-1c4b-4281-b951-d872f2087c98
* Implemented full-screen support for Core Graphics and Core Animationkbr@google.com2010-05-2410-188/+702
| | | | | | | | | | | | | | | | | | | | | | rendering models using a top-level NSWindow and rendering to an NSOpenGLContext which shares resources with the CGLContextObj used to render into the plugin region. Synthesizes and dispatches NPCocoaEvents for the mouse, keyboard and focus change events received by the window. Exposed primitives needed to reset state in the OpenGL context and to switch the Renderer's notion of the context. Fixed bug in offscreen rendering support previously added in support of Core Graphics drawing model. Tested with full-screen sample and modified render-mode sample on Mac OS X 10.6 in Safari 4 and on Mac OS X 10.5 with a version of Chromium with the O3D blacklist entry removed. BUG=http://code.google.com/p/o3d/issues/detail?id=221 TEST=none Review URL: http://codereview.chromium.org/2095023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48076 0039d316-1c4b-4281-b951-d872f2087c98
* Refactored Buffer and Field getAt functions to use a common helper function, ↵petersont@google.com2010-05-242-27/+38
| | | | | | | | avoiding redundant code. Review URL: http://codereview.chromium.org/2081002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48071 0039d316-1c4b-4281-b951-d872f2087c98
* Add breakpad. zhurunz@google.com2010-05-226-2/+389
| | | | | | Review URL: http://codereview.chromium.org/2092021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47987 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed crash on Mac OS X introduced inkbr@google.com2010-05-211-7/+8
| | | | | | | | | | | | | | | | http://codereview.chromium.org/1627007 / http://codereview.chromium.org/1527030 . Ensure the renderer is initialized before attempting to use it. Only enable new code path if actually uploading textures via IMC. Tested in Safari 4 on Mac OS X 10.6. BUG=none TEST=none Review URL: http://codereview.chromium.org/2103014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47924 0039d316-1c4b-4281-b951-d872f2087c98
* Refactored full-screen code under FullscreenWindowMac base class andkbr@google.com2010-05-1910-569/+861
| | | | | | | | | | | | | | | | | overlay window code into OverlayWindowMac class. This is an intermediate step toward a Cocoa and CGL implementation. Verified that mouse and key events continue to work in full-screen mode with full-screen sample and a modified render-mode.html in Firefox 3.6.3 on Mac OS X, where O3D continues to use the Quickdraw drawing model. BUG=http://code.google.com/p/o3d/issues/detail?id=221 TEST=none Review URL: http://codereview.chromium.org/2129015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47733 0039d316-1c4b-4281-b951-d872f2087c98
* The z-sorting sample looked tinted gray because of the final alpha channel ↵petersont@google.com2010-05-193-6/+16
| | | | | | | | copying to the screen. Fixing this revealed that the sort was actually broken in a different way as well, so I fixed that, too. Review URL: http://codereview.chromium.org/2074015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47606 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed a typo in pool code and made comments more google stylepetersont@google.com2010-05-174-19/+29
| | | | | | | Implemented ParamObject.removeParam and ParamObject.copyParams. Minor style change in primitive.js. Review URL: http://codereview.chromium.org/2083004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47465 0039d316-1c4b-4281-b951-d872f2087c98
* Sorts drawlists by priority or by depth as indicated by the flag in the ↵petersont@google.com2010-05-174-7/+272
| | | | | | | | DrawPass. Review URL: http://codereview.chromium.org/2075003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47459 0039d316-1c4b-4281-b951-d872f2087c98
* Refactored the SAS parameter code slightly to avoid redundant listing of ↵petersont@google.com2010-05-142-181/+170
| | | | | | | | parameter names. Review URL: http://codereview.chromium.org/2122002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47337 0039d316-1c4b-4281-b951-d872f2087c98
* When a demo on the o3d-webgl site gets opened in an ordinary browser that ↵petersont@google.com2010-05-142-11/+78
| | | | | | | | doesn't support WebGL yet, the error message just says "WebGL context not found". Now it provides a link with more information. Review URL: http://codereview.chromium.org/2099002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47312 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Undo the change in r44662 to use npo3dautoplugin for the default Mac ↵tschmelcher@chromium.org2010-05-114-20/+82
| | | | | | | | | | | bundle name and instead return to using "O3D". TEST=built with default name and with an overridden name, on Mac BUG=none Review URL: http://codereview.chromium.org/2027004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46957 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: Make the Debian package build rules work with both Make and SCons.tschmelcher@chromium.org2010-05-101-10/+9
| | | | | | | | | TEST=built on Linux with both Make and SCons BUG=none Review URL: http://codereview.chromium.org/1997008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46846 0039d316-1c4b-4281-b951-d872f2087c98