summaryrefslogtreecommitdiffstats
path: root/o3d/utils
Commit message (Collapse)AuthorAgeFilesLines
* Add comments setting emacs and vim tab width and expansion variables.sgk@google.com2009-10-061-0/+6
| | | | | | | | BUG=none TEST=successful builds Review URL: http://codereview.chromium.org/256059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28089 0039d316-1c4b-4281-b951-d872f2087c98
* Add missing gclient dependencies to .gitignore.maruel@chromium.org2009-09-174-472/+472
| | | | | | | | | | | | | | Fix the format of many directories so they don't show up in git status anymore. Run dos2unix on *.cc, caught many inconsistent and CRLF files. TBR=evan TEST=still build, git status shows nothing BUG=none Review URL: http://codereview.chromium.org/211010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26441 0039d316-1c4b-4281-b951-d872f2087c98
* Reverts fix for the scons build and fixes it in a different way sogspencer@google.com2009-09-162-5/+18
| | | | | | | | that both the scons and gyp builds are functional. Review URL: http://codereview.chromium.org/204049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26399 0039d316-1c4b-4281-b951-d872f2087c98
* Fix build breakage concerning CreateTemporaryFile vs CreateTemporaryFileName.maf@google.com2009-09-162-5/+5
| | | | | | Review URL: http://codereview.chromium.org/193122 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26310 0039d316-1c4b-4281-b951-d872f2087c98
* This updated the GYP deps file to the last known good revision of Chrome,gspencer@google.com2009-09-152-5/+5
| | | | | | | | and all the associated third party packages. Review URL: http://codereview.chromium.org/203077 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26283 0039d316-1c4b-4281-b951-d872f2087c98
* Make Convertor project compile in GCC - fixes release-build only compiler ↵maf@google.com2009-09-031-218/+218
| | | | | | | | errors. Review URL: http://codereview.chromium.org/197003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25333 0039d316-1c4b-4281-b951-d872f2087c98
* Get Mac GYP build compiling.maf@google.com2009-09-031-125/+125
| | | | | | Review URL: http://codereview.chromium.org/172119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25292 0039d316-1c4b-4281-b951-d872f2087c98
* This CL adds the createRawDataFromDataURL function to o3d.Pack. The functionmstrydom@google.com2009-09-026-0/+414
| | | | | | | | | | takes as input a data URL, decodes the data, and returns the raw data in a RawData object. If the data URL has an invalid format, an error message is displayed. Currently only data URL's encoded in base64 are supported. The mime type is ignored. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25252 0039d316-1c4b-4281-b951-d872f2087c98
* Lots of changes needed to build with GCC in Chrome.maf@google.com2009-08-121-5/+5
| | | | | | Review URL: http://codereview.chromium.org/164364 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23246 0039d316-1c4b-4281-b951-d872f2087c98
* fix for gccgman@google.com2009-08-081-0/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22871 0039d316-1c4b-4281-b951-d872f2087c98
* This CL adds client.toDataURL which gets the contentsgman@google.com2009-08-088-0/+380
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the client area as a data url (which is a base64 encoded string of a png file) data urls are part of the HTML5 standard and supported by firefox, safari and chrome. http://www.whatwg.org/specs/web-apps/current-work/multipage/the-canvas-element.html#dom-canvas-todataurl That means you can now do this var dataURL = client.toDataURL(); // make an IMG tag display the screenshot someImgTag.src = dataURL; // use the IMG tag to draw into a canvas someCanvasContext.drawImage(someImageTag, ...); It also means there is no need for the test builds anymore "test-dbg-d3d", "test-opt-d3d" etc as toDataURL is part of the public API and can therefore always be used to take screenshots in any build. I updated the selenium code to use it. There are a few issues: 1) The GL version has the same limitations as taking a screenshot before. Namely that the client area must be on screen. We need to fix this. 2) We need to add support for origin-clean. See https://tracker.corp.google.com/story/show/180334 Review URL: http://codereview.chromium.org/164130 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22869 0039d316-1c4b-4281-b951-d872f2087c98
* Lots of changes required to build on GCC in full paranoia mode with no ↵maf@google.com2009-08-063-29/+29
| | | | | | | | 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
* Updated O3D to work with most recent Chrome base.apatrick@google.com2009-08-051-4/+0
| | | | | | | 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
* Prep for moving Camera Info out of Params into JSONgman@google.com2009-07-243-0/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Fixing several problems with the build.gspencer@google.com2009-07-231-0/+4
| | | | | | | | | | | | | - 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
* This switches the FindFileHelper to use the non-deprecatedgspencer@google.com2009-07-231-1/+1
| | | | | | | | GetComponents instead of the old file_util routine (which no longer exists). Review URL: http://codereview.chromium.org/159283 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21442 0039d316-1c4b-4281-b951-d872f2087c98
* TBR=gspencer@google.comgman@google.com2009-07-231-0/+2
| | | | | | | Fix for mac/linux for FindFile test. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21378 0039d316-1c4b-4281-b951-d872f2087c98
* Add --file_paths to converter to allow converter to rungman@google.com2009-07-233-2/+124
| | | | | | | | | | | | | | | | | | | | with typical collada files found on the net. Often someone will export a collada file with absolute paths like "z:\someplace\somewhere\texture.tga" and "k:\shared\stuff\othertexture.tga" The converter needed a way to handle these without requiring an artist to manually edit XML files. I also refactored the original_data_ stuff to make sure we don't get 2 datas for the same path. I'm doing that in prepartion for shortening the paths where possible using base-path or some mechanism. Review URL: http://codereview.chromium.org/159118 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21352 0039d316-1c4b-4281-b951-d872f2087c98
* Adding in most of the unit tests. This adds 406 of our unit testsgspencer@google.com2009-07-011-8/+13
| | | | | | | | | 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
* This adds in the GYP files needed for our GYP build,gspencer@google.com2009-06-241-0/+58
| | | | | | | and modifies the DEPS file extensively to match. Review URL: http://codereview.chromium.org/131116 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19091 0039d316-1c4b-4281-b951-d872f2087c98
* This fixes a bunch of warnings that are in our code, in order for the GYP ↵gspencer@google.com2009-06-083-3/+13
| | | | | | | | build to succeed. Review URL: http://codereview.chromium.org/118346 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17865 0039d316-1c4b-4281-b951-d872f2087c98
* This is the O3D source tree's initial commit to the Chromium tree. It gspencer@google.com2009-05-2726-0/+3056
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