summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* Implemented error texture support in client and ParamArray class. Fixed bug ↵luchen@google.com2010-07-1410-49/+1091
| | | | | | | | | in effect.js that broke checkerboard texture if running using CG shaders. TODO: Still a bug with render surface sets; will file issue and tackle problem in separate CL. Review URL: http://codereview.chromium.org/2803007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52248 0039d316-1c4b-4281-b951-d872f2087c98
* o3d-webgl: Adding oldschoolshadows sample.luchen@google.com2010-07-131-0/+277
| | | | | | Review URL: http://codereview.chromium.org/2924015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52210 0039d316-1c4b-4281-b951-d872f2087c98
* Windows: Change the generation of the various templated metadata files to ↵tschmelcher@chromium.org2010-07-131-13/+23
| | | | | | | | | | | place them in SHARED_INTERMEDIATE_DIR (build\Debug\obj\global_intermediate) rather than generating them in-place. In-place generation was problematic because the MSVS GYP back-end is bad at re-generating files whose rules have changed (e.g., due to a change in a branding variable), so it is good practice to put all output under build\<mode> so that deleting those directories always ensures a clean build. TEST=built on Windows and installed and tested some samples BUG=none Review URL: http://codereview.chromium.org/2976006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52205 0039d316-1c4b-4281-b951-d872f2087c98
* Parameterize the name of the "O3DExtras" directory with a GYP variable (to ↵tschmelcher@chromium.org2010-07-1210-19/+16
| | | | | | | | | | | | | | allow side-by-side installs of differently-branded builds that both include the extras directory). Also move the branding.gypi and version.gypi files from plugin/ to build/, which is a more sensible location. Also delete an extraneous definition of plugin_enable_fullscreen_msg from core.gyp (it's already in common.gypi). TEST=built on Windows, both with and without plugin_extras_directory specified BUG=none Review URL: http://codereview.chromium.org/2893011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52153 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes a TypeError bug introduced in the picking change. Cannot cancel event ↵luchen@google.com2010-07-121-1/+3
| | | | | | | | propagation if the event is cloned; need to cancel the original event object. Review URL: http://codereview.chromium.org/2962009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52115 0039d316-1c4b-4281-b951-d872f2087c98
* Box2d-3d demo ported to WebGL. Needed to strip some whitespace characters ↵luchen@google.com2010-07-1216-0/+6341
| | | | | | | | from the compressed box2d file to fix 'RangeError: Maximum call stack size exceeded' error in WebKit. Review URL: http://codereview.chromium.org/2845011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52110 0039d316-1c4b-4281-b951-d872f2087c98
* Adding checkers demo.luchen@google.com2010-07-121-0/+873
| | | | | | Review URL: http://codereview.chromium.org/2892004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52109 0039d316-1c4b-4281-b951-d872f2087c98
* o3d/linux: fix --as-needed for glespiman@chromium.org2010-07-121-14/+25
| | | | | | Review URL: http://codereview.chromium.org/2946005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52108 0039d316-1c4b-4281-b951-d872f2087c98
* Work around exception in command "which" while running GYP inside ChromiumOS ↵zhurunz@google.com2010-07-121-1/+1
| | | | | | | | | | | | | | | chroot. ChromiumOS is trying to remove dpkg-buildpackage. If running inside ChromiumOS chroot, the "which" can throw exception when the target file is missing. ( dpkg-buildpackage will be missing in this case ) This doesn't happen with the "which" on Ubuntu. Work around it by using "whereis" instead. It works on both ChromiumOS choot and Ubuntu. Review URL: http://codereview.chromium.org/2945011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52099 0039d316-1c4b-4281-b951-d872f2087c98
* Improvement from codereview http://codereview.chromium.org/2899008/showzhurunz@google.com2010-07-121-12/+9
| | | | | | Review URL: http://codereview.chromium.org/2933007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52095 0039d316-1c4b-4281-b951-d872f2087c98
* Implemented picking, at last. The picking sample is already checked in, but ↵petersont@google.com2010-07-0919-352/+983
| | | | | | | | to get the sample to draw the right thing required a bunch of ancillary bug fixes, also in this cl. Review URL: http://codereview.chromium.org/2874008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52021 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: Fix DCHECK failure in Chrome caused by re-entrant rendering. This ↵tschmelcher@chromium.org2010-07-091-0/+2
| | | | | | | | | | | wasn't actually causing problems in release builds (presumably O3D was able to complete the re-entrant render action without problems), but we still don't want to do it. TEST=loaded a debug build repeatedly in Chrome/Linux and verified no DCHECK failure, whereas previously it happened a fair amount BUG=none Review URL: http://codereview.chromium.org/2944006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51999 0039d316-1c4b-4281-b951-d872f2087c98
* Bump O3D version.zhurunz@google.com2010-07-091-1/+1
| | | | | | Review URL: http://codereview.chromium.org/2899012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51986 0039d316-1c4b-4281-b951-d872f2087c98
* Some changes in RENDERMODE_CONTINUOUS mode when max_fps has been set.zhurunz@google.com2010-07-096-10/+60
| | | | | | | | | | | | | | | | | | | | | | | If Renderer::max_fps has been set, rendering is driven by incoming new textures. We draw on each new texture as long as not exceeding max_fps. If we are in RENDERMODE_ON_DEMAND mode, Client::Render() can still set dirty specifically. If we are in ENDERMODE_CONTINUOUS mode, we do NOT set dirty on each tick any more (since it is already driven by new textures.). There is one problem here: what if new texture don't come in for some reason? If that happened, no rendering callback will be invoked and this can cause problem sometimes. For example, some UI may depend on the rendering callback to work correctly. So, in RENDERMODE_CONTINUOUS mode, if we have set max_fps but haven't received any new texture for a while, we draw anyway to trigger the rendering callback. Review URL: http://codereview.chromium.org/2899008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51982 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor AsyncTick to force Chrome through the reentrancy checks formerly in ↵tschmelcher@chromium.org2010-07-082-18/+27
| | | | | | | | | | | | | TickPluginObject, which fixes crashes in Chrome on Windows due to reentrant calls to NPP_URLNotify(). Also fix a bug where pending_ticks_ was not decremented in the reentrancy failure path, which would have caused all future AsyncTick() calls to be ignored. TEST=repeatedly loaded O3D in Chrome on Windows dozens of times and verified no crashes, whereas previously these crashes were frequent on this machine BUG=none Review URL: http://codereview.chromium.org/2824050 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51911 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed race condition in O3D/WebGL FileRequest implementation by onlykbr@google.com2010-07-081-15/+14
| | | | | | | | | | | initiating download upon send(). BUG=none TEST=none Review URL: http://codereview.chromium.org/2903002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51909 0039d316-1c4b-4281-b951-d872f2087c98
* Rolled forward O3D's Chromium DEPS to match the Skia roll-forward inkbr@google.com2010-07-0811-53/+81
| | | | | | | | | | | | | the last CL, which broke the Linux build due to version mismatches. Thanks to tschmelcher for help with the Linux changes. Built and tested O3D on Windows, Linux and Mac OS X. BUG=none TEST=none Review URL: http://codereview.chromium.org/2952001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51895 0039d316-1c4b-4281-b951-d872f2087c98
* Made code which determines which side of contours to fill more robustkbr@google.com2010-07-074-59/+83
| | | | | | | | | | | | | | | | | | using new outgoing "ambiguous" parameter added to Skia XRay queries. Rolled forward Skia dependency to latest revision. With these changes the SVG butterfly renders correctly in O3D. Boosted polygon offsets again to avoid pixel dropouts. Also tested O3D canvas demos to verify no breakage with Skia roll-forward. BUG=none TEST=none Review URL: http://codereview.chromium.org/2813049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51791 0039d316-1c4b-4281-b951-d872f2087c98
* Changed definition of IntervalTree to contain closed, rather thankbr@google.com2010-07-064-12/+82
| | | | | | | | | | | | | | open, intervals, and changed back PathProcessor's AllSegmentsOverlappingY debug routine to report closed intervals. This fixes more rendering issues with the SVG butterfly. BUG=none TEST=samples/gpu2d/regression-tests/orientation-bug-3.html TBR=apatrick Review URL: http://codereview.chromium.org/2847049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51670 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed mismatch in fast and slow queries in overlap tests duringkbr@google.com2010-07-054-7/+168
| | | | | | | | | | | | | | | orientation determination which was causing assertion failures on some inputs. Avoided ray casting tests where results will not change decision of which side to fill. SVG butterfly is closer to rendering correctly with these changes but is still not 100% correct. BUG=none TEST=samples/gpu2d/regression-tests/orientation-bug-2.html TBR=apatrick Review URL: http://codereview.chromium.org/2862045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51643 0039d316-1c4b-4281-b951-d872f2087c98
* Adding 2d and hud-2d demos to samples. Small addition to state.js to ↵luchen@google.com2010-06-294-0/+1057
| | | | | | | | actually use the depthMask flag. Review URL: http://codereview.chromium.org/2830020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51192 0039d316-1c4b-4281-b951-d872f2087c98
* o3d-webgl: adding shader test demo.luchen@google.com2010-06-2915-1/+1746
| | | | | | Review URL: http://codereview.chromium.org/2830003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51186 0039d316-1c4b-4281-b951-d872f2087c98
* Fix issue where concurrent access to V8 from different threads resulted in ↵tschmelcher@chromium.org2010-06-283-6/+36
| | | | | | | | | | | | | crashes. V8 is not reentrant (yet), so the recommended solution is to globally lock V8 whenever doing anything with it. In practice this was only an issue in IE, perhaps because that is the only browser that uses different threads for different plugin instances within the same process. Also change some unused public methods to private. TEST=concurrent running/loading/playing of the Simple Scene Viewer, checkers.html, 2d.html, box2d-3d, and the pool app, all in both Win IE and Win Chrome BUG=none Review URL: http://codereview.chromium.org/2844026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51073 0039d316-1c4b-4281-b951-d872f2087c98
* 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
generated by cgit v1.1 at 2025-01-30 19:25:36 +0000