summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* Add usual cleanup code for this sample, fixing breakage with Firefox's ↵kbr@google.com2009-08-081-0/+11
| | | | | | | | backward / forward cache. Review URL: http://codereview.chromium.org/164174 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22852 0039d316-1c4b-4281-b951-d872f2087c98
* Changes for Mac GYP build: fix source that causes compiler warnings, fix ↵maf@google.com2009-08-076-310/+321
| | | | | | | | includes and defines. Review URL: http://codereview.chromium.org/164129 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22770 0039d316-1c4b-4281-b951-d872f2087c98
* Removed manual setting of iexplore.exe path on 64-bit Windows duringkbr@google.com2009-08-072-16/+1
| | | | | | | | | | | | | | | Selenium runs. The new version of Selenium interprets this as a command to override the path to mshta.exe, which runs the Selenium driver, but this driver does not run in iexplore.exe due to limitations on IE's supported command line length. The current version of Selenium seems to have solved the issue of running the tests within 64-bit IE; with this change O3D runs within Selenium on Vista 64, but only with UAC off. Also updated dependencies for selenium_ie target to ensure o3d_host.dll is built. Review URL: http://codereview.chromium.org/165139 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22766 0039d316-1c4b-4281-b951-d872f2087c98
* This CL adds texture.getRectgman@google.com2009-08-076-31/+354
| | | | | | Review URL: http://codereview.chromium.org/165118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22765 0039d316-1c4b-4281-b951-d872f2087c98
* This adds a stub for the mac installer so that the gyp generation won't fail ↵gspencer@google.com2009-08-072-0/+45
| | | | | | | | on Macs. Review URL: http://codereview.chromium.org/165109 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22717 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the error I introduced into the installer build.scons file.gspencer@google.com2009-08-061-1/+1
| | | | | | Review URL: http://codereview.chromium.org/165098 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22687 0039d316-1c4b-4281-b951-d872f2087c98
* This completes the building of o3d.msi from the GYP build.gspencer@google.com2009-08-0615-35/+422
| | | | | | Review URL: http://codereview.chromium.org/164044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22680 0039d316-1c4b-4281-b951-d872f2087c98
* Updated to o3d revision 113.apatrick@google.com2009-08-061-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22657 0039d316-1c4b-4281-b951-d872f2087c98
* Need to define XP_MACOSX=1 for npapi.h to work as needed on Mac.maf@google.com2009-08-061-0/+3
| | | | | | | This fixes all the "does not define a type" compile errors. Review URL: http://codereview.chromium.org/164046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22639 0039d316-1c4b-4281-b951-d872f2087c98
* fix for mac buildgman@google.com2009-08-061-0/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22598 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes for gccgman@google.com2009-08-062-12/+14
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22597 0039d316-1c4b-4281-b951-d872f2087c98
* oops, forgot these filesgman@google.com2009-08-065-16/+1282
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22584 0039d316-1c4b-4281-b951-d872f2087c98
* A step in exposing Bitmap to JavaScript.gman@google.com2009-08-0668-1625/+1113
| | | | | | | | | | | | | | | | | | | | | The plan is to make pack.createBitmapFromRawData return an array of bitmaps. 1 bitmap if it's a standard 2d image 6 bitmaps if it's a cubemap N bitmaps if it's a volume map. The bitmaps will have a semantic so you can look at them and tell they were from a volumemap, a cubemap or a 2d image. On the way I'm attempting to clean up the code. Moving stuff out of Bitmap the did not belong there and Refactoring Bitmap so there are less If Format = stuff. Review URL: http://codereview.chromium.org/164034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22583 0039d316-1c4b-4281-b951-d872f2087c98
* Lots of changes required to build on GCC in full paranoia mode with no ↵maf@google.com2009-08-0647-321/+338
| | | | | | | | warnings generated. Review URL: http://codereview.chromium.org/165013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22581 0039d316-1c4b-4281-b951-d872f2087c98
* Update v8 to 1.3.2, same as chrome. That version has a fix for Linux.piman@google.com2009-08-062-4/+4
| | | | | | | Review URL: http://codereview.chromium.org/164035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22571 0039d316-1c4b-4281-b951-d872f2087c98
* Updated O3D to work with most recent Chrome base.apatrick@google.com2009-08-056-12/+41
| | | | | | | Added build.scons for Chrome IPC. Review URL: http://codereview.chromium.org/160616 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22545 0039d316-1c4b-4281-b951-d872f2087c98
* Putting some stubs in so that gyp generation doesn't fail on Mac and so that ↵gspencer@google.com2009-08-052-5/+26
| | | | | | | | it doesn't fail when the internal repository isn't available. Review URL: http://codereview.chromium.org/159848 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22476 0039d316-1c4b-4281-b951-d872f2087c98
* Added default values to property documentation.gman@google.com2009-08-0529-76/+213
| | | | | | | | Fixed a few more docs issues. Review URL: http://codereview.chromium.org/159894 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22463 0039d316-1c4b-4281-b951-d872f2087c98
* Make build touch the O3D.plugin directory so it's as new as the binary we ↵maf@google.com2009-08-051-0/+1
| | | | | | | | just put in there. Review URL: http://codereview.chromium.org/159895 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22458 0039d316-1c4b-4281-b951-d872f2087c98
* Adding missing gyp filegspencer@google.com2009-08-041-0/+77
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22358 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes for last bitmap changegman@google.com2009-08-047-64/+39
| | | | | | | | Added tests to gyp build Review URL: http://codereview.chromium.org/159835 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22352 0039d316-1c4b-4281-b951-d872f2087c98
* This fixes some things that crept into the build as the scons build changed.gspencer@google.com2009-08-043-4/+7
| | | | | | Review URL: http://codereview.chromium.org/160557 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22350 0039d316-1c4b-4281-b951-d872f2087c98
* This adds splitting of samples for the interactive sampler,gspencer@google.com2009-08-0311-58/+434
| | | | | | | | and docs building to the GYP build. Review URL: http://codereview.chromium.org/159825 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22348 0039d316-1c4b-4281-b951-d872f2087c98
* turn off bitmap-draw-test for pulse for nowgman@google.com2009-08-031-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22343 0039d316-1c4b-4281-b951-d872f2087c98
* Add SetRect to Texture2d and TextureCUBEgman@google.com2009-08-0333-587/+1976
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally I was going to replace Lock/Unlock with only SetRect (and maybe GetRect) and I did that. But then as I was going through the code things started not being so cool. The JavaScript texture.SetRect where as before it allocated no memory, now it needed to allocate a temporary buffer just to be able to write the texture. DrawImage also would have have required copying the original texture out using GetRect, then modifying it, then copying it back even in D3D or it would have required a temporary buffer. That's what happens under the hood in the GL implementation of Texture2D but why should D3D suffer because of the of GL? Or maybe it's a reasonable compomise the D3D should go slower so that GL isn't twice as slow as it it could be? So, I left Lock/Unlock and added SetRect as well. This CL should help the video guys and we can decide if we want to get rid of Lock/Unlock later. SetRect is really only there because trying to make GL act like D3D makes GL slow since we had to get a copy of the texture from GL before Locking. SetRect, since it is not exposing the original data doesn't need to do that. So, now there are both. If need to read (and write) to the texture use Lock. If you only need to write use SetRect. I also fixed Lock/Unlock so they return a pitch which is required for D3D. While I did that I made Lock/Unlock private so you have to use the TextureXXXLockHelpers to access the data. I didn't do the command buffer versions. I also added stubs for texture tests. We need to add more tests. I feel like a lot of clean up needs to happen. It seesm like Bitmap should be split into Bitmap2D BitmapCUBE BitmapVolume Possibly. And maybe BitmapCube should effectively just be typedef Bitmap2D BitmapCUBE[6] and BitmapVolume would be std::vector<Bitmap2D> Then we wouldn't need face and volume versions of various functions. You'd just get the face or the slice Bitma2D and then use the 2D functions. We should decide if that's what we want before pushing a new release. Otherwise we should remove bitmap.idl from idl_scons.lst and the one sample And ship without exposing Bitmap until we are sure they API we are exposing is the one we want. Review URL: http://codereview.chromium.org/159725 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22332 0039d316-1c4b-4281-b951-d872f2087c98
* Renaming libevent to event.apatrick@google.com2009-08-031-0/+0
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22308 0039d316-1c4b-4281-b951-d872f2087c98
* Asynchronous tick now uses NPN_PluginAsyncCall.URL streaming callbacks are ↵apatrick@google.com2009-08-0373-361/+1844
| | | | | | | | now also asynchronous.Implemented NPN_PluginAsyncCall for IE.Allowed WM_PAINT handler to be reentered because it no longer calls into the browser (except to schedule an asynchronous tick if none is pending).Fixed a bug where the EventManager would crash if an event callback called cleanUp on the client.Cleanup destroys all the packs. Doing this in NPP_Destroy seems to make Chrome timeout and fail to load the next page.Tar and GZ decoding happens on a new thread. Review URL: http://codereview.chromium.org/155733 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22305 0039d316-1c4b-4281-b951-d872f2087c98
* minor fix to correctly strip goog.exportSymbolsgman@google.com2009-08-031-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22259 0039d316-1c4b-4281-b951-d872f2087c98
* This adds the sample conversion to the GYP build, at least on Windows.gspencer@google.com2009-07-3011-12/+235
| | | | | | | | | It also fixes some small problems with the build (naming of plugin DLL and activex host dll) Review URL: http://codereview.chromium.org/160428 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22122 0039d316-1c4b-4281-b951-d872f2087c98
* Don't zero newly allocated bitmap data - it's already been zeroed.maf@google.com2009-07-302-8/+0
| | | | | | Review URL: http://codereview.chromium.org/159622 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22038 0039d316-1c4b-4281-b951-d872f2087c98
* Remove source assets from gclient sync depsgman@google.com2009-07-302-2/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22026 0039d316-1c4b-4281-b951-d872f2087c98
* Version number bump for releasebradnelson@google.com2009-07-291-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22008 0039d316-1c4b-4281-b951-d872f2087c98
* Removed HostControl implementation of IPersistStreamInitImpl.apatrick@google.com2009-07-291-3/+0
| | | | | | | See http://msdn.microsoft.com/en-us/visualc/ee309358.aspx. According to the description of the vulnerability, O3D is not vulnerable. But HostControl does not need to implement this interface anyway so I'm removing it. Review URL: http://codereview.chromium.org/160342 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21994 0039d316-1c4b-4281-b951-d872f2087c98
* linux: unexport as many symbols as possiblepiman@google.com2009-07-296-12/+27
| | | | | | | | | | See discussion on http://code.google.com/p/chromium/issues/detail?id=17557 On linux, exported symbols from a shared library can be overridden by another unit (e.g. the browser) if it exports the same ones. So compile everything with -fvisibility=hidden to make every symbol private by default, and explicitly export the ones that we care about. Also make sure that third-party deps (e.g. icu) don't explicitly export symbols. Review URL: http://codereview.chromium.org/160317 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21992 0039d316-1c4b-4281-b951-d872f2087c98
* Change <script id="o3d" to <script id="o3dscript"gman@google.com2009-07-2897-97/+97
| | | | | | | | | so that document.getElementById('o3d') will work for finding the o3d div. Review URL: http://codereview.chromium.org/159556 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21924 0039d316-1c4b-4281-b951-d872f2087c98
* Remove *.vsprops files that are no longer referenced (or only havesgk@google.com2009-07-281-10/+0
| | | | | | | | | references to each other) anywhere in the Chromium code base. BUG=none TEST=rebuild Review URL: http://codereview.chromium.org/159523 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21873 0039d316-1c4b-4281-b951-d872f2087c98
* Change box2d to use compiled verison of box2d.js fromgman@google.com2009-07-2867-11535/+1039
| | | | | | | | | | author http://code.google.com/p/o3d/issues/detail?id=10 Review URL: http://codereview.chromium.org/159396 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21828 0039d316-1c4b-4281-b951-d872f2087c98
* Changes to picking example to show how to getgman@google.com2009-07-283-15/+148
| | | | | | | | | | | the surface normal for the spot picked. Apparently no screenshots are taken for picking so no deps files need up be updated Review URL: http://codereview.chromium.org/159442 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21805 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing 'click' event handling: vangelis@google.com2009-07-281-2/+8
| | | | | | | | http://code.google.com/p/o3d/issues/detail?id=98 Review URL: http://codereview.chromium.org/160051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21791 0039d316-1c4b-4281-b951-d872f2087c98
* Changes to upgrade to public version of seleniumgman@google.com2009-07-275-36/+22
| | | | | | | | | | | | | | Pulls in new selenium (selenium_rc) and removes old selenium (java, py) dependencies also removes doxygen dependency This is dependent on this CL http://codereview.appspot.com/96131 Review URL: http://codereview.chromium.org/160089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21712 0039d316-1c4b-4281-b951-d872f2087c98
* This change fixes the issue that if you usegman@google.com2009-07-2498-168/+194
| | | | | | | | | | | | | | | | | | | | | | o3djs.util.setMainEngine(...V8) in any sample and you use scripts that you don't want run in V8, for example Adsense, Google Analyitics, Wave, Google WebElements then the o3djs would attempt to pull in that javascript and execute it in V8. Specifically this refers to inline <script> tags instead HTML. Not <script src="url"> tags. The solution is we add an id to the tags we want o3djs to pull in. Any script with an id that starts with "o3d" will get pulled in. This CL changes our samples to have that id on their script tags. Review URL: http://codereview.chromium.org/159339 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21585 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for linux againgman@google.com2009-07-241-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21546 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes for linuxgman@google.com2009-07-244-4/+10
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21523 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for bug in GCCgman@google.com2009-07-243-9/+6
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21521 0039d316-1c4b-4281-b951-d872f2087c98
* Prep for moving Camera Info out of Params into JSONgman@google.com2009-07-2415-2/+1671
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I thought it was best to give you what I have so far for your input and code review instead of giving you everything all at once. This CL implements JSONObject which has a mechanism for adding stuff to be serialized as JSON to the serialization code. Since JSONObject is a serialization only object it seemed okay to put Serialize code inside. I opted to pre-declare JSONFloat and JSONOptionalFloat because I felt it made the code more error free. I had made it were you could just have JSONFloat and then with RegisterJSONValue you'd pass in optional or not but this way, declaring the field in a class makes it more explicit. CameraInfo is the first class that uses it. I'm not set on exactly how it is serialized. Whether it's as "object: { ... }" inside the "properties" section or whether it should have its own section. I think I won't know what until I actually write the deserialization code. That's not imporant for this CL This code, even if checked it, is not used yet as the import code, collada.cc, is not yet creating any of these objects. That's in another CL if you want to take a look http://codereview.chromium.org/160007 That CL will have to have lots of o3djs changes, corresponding sample changes and corresponding selenium test changes. Review URL: http://codereview.chromium.org/160008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21515 0039d316-1c4b-4281-b951-d872f2087c98
* Adding Bison and ANTLR grammars for GLSL ES. The grammars are derivedkbr@google.com2009-07-2412-0/+1747
| | | | | | | | | | | | | | | from the OpenGL ES specification and are intended to match the structure in the spec as closely as possible while working with existing tools. Hints were taken from the Mesa GLSL grammar, which uses a custom parser generator, to solve reduce/reduce conflicts in the Bison version. The grammars do nothing at the moment except parse inputs and provide rudimentary error reporting. Follow-on work will extend these grammars with the intended functionality. Basic testing has been done but much more is needed. Review URL: http://codereview.chromium.org/159324 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21499 0039d316-1c4b-4281-b951-d872f2087c98
* Adds in the ActiveX control for O3D.gspencer@google.com2009-07-247-15/+90
| | | | | | Review URL: http://codereview.chromium.org/160078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21492 0039d316-1c4b-4281-b951-d872f2087c98
* Add a boolean parameter to Client::RenderClient() to choose whether tomaf@google.com2009-07-237-18/+31
| | | | | | | | | | | | | | make the javascript render callback or not. Generally you want to pass true, but if the render is happening in non-windowed mode (eg on a Mac) and is in response to an update event rather than a timer, it can be useful to pass false to prevent the javascript code triggering another update and causing an infinite calback loop. Case in point is the custom camera example, which modifies some HTML form text fields on render callback, which on Firefox causes a plugin invalidation and round and round we would go. Review URL: http://codereview.chromium.org/159181 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21473 0039d316-1c4b-4281-b951-d872f2087c98
* Fix message queue test build breakage.gspencer@google.com2009-07-232-13/+15
| | | | | | Review URL: http://codereview.chromium.org/159315 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21471 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing several problems with the build.gspencer@google.com2009-07-234-5/+9
| | | | | | | | | | | | | - Had to make one line file_path_utils conditional on which build system was building it (because GYP build and scons build use different versions of chrome/base). - Missed a couple instances of "file/" in the path to nixysa. - New version of breakpad has a different API on the Mac. Review URL: http://codereview.chromium.org/160056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21470 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-02-08 14:08:06 +0000