summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* Remove references to pack.createTextureFromRawDatagman@google.com2009-08-191-6/+6
| | | | | | | | as it has been deprecated. Review URL: http://codereview.chromium.org/173071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23727 0039d316-1c4b-4281-b951-d872f2087c98
* Fix bug where shaders fail if the last // #o3d linegman@google.com2009-08-191-0/+1
| | | | | | | | does not have an end-of-line Review URL: http://codereview.chromium.org/173070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23726 0039d316-1c4b-4281-b951-d872f2087c98
* Changes needed to make "all" build complete, including fixing the generated ↵maf@google.com2009-08-197-26/+47
| | | | | | | | converter tool. Review URL: http://codereview.chromium.org/173045 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23721 0039d316-1c4b-4281-b951-d872f2087c98
* Changes to make test project build.maf@google.com2009-08-195-220/+219
| | | | | | Review URL: http://codereview.chromium.org/172081 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23692 0039d316-1c4b-4281-b951-d872f2087c98
* Additions of minor utility functions.kbr@google.com2009-08-191-0/+37
| | | | | | Review URL: http://codereview.chromium.org/173041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23689 0039d316-1c4b-4281-b951-d872f2087c98
* Small fix for IMC UPDATE_TEXTURE_2Dgman@google.com2009-08-192-12/+115
| | | | | | Review URL: http://codereview.chromium.org/173036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23688 0039d316-1c4b-4281-b951-d872f2087c98
* Add test for texture::SetRect to make sure -pitchgman@google.com2009-08-191-0/+91
| | | | | | | | works. Review URL: http://codereview.chromium.org/174037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23685 0039d316-1c4b-4281-b951-d872f2087c98
* A bunch more docs fixesgman@google.com2009-08-1915-110/+99
| | | | | | Review URL: http://codereview.chromium.org/171070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23679 0039d316-1c4b-4281-b951-d872f2087c98
* expose Bitmap to JavaScript.gman@google.com2009-08-1927-333/+1360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added Texture.drawImage(canvas...) There's still the big question of whether we should flip textures by default in the o3d code. Currently I'm flipping them by default in o3djs.texture.createTextureFromRawData and I'm flipping them by default in o3djs.canvas.CanvasQuad.updateTexture. I'm torn whether or not I should be flipping them. I feel like 2d examples and examples of displaying images, like a picasa viewer, would be simpler if we didn't flip by default but the problem then is if you load some textures through a collada scene they'll be flipped the opposite of any textures you load by hand. Review URL: http://codereview.chromium.org/171060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23678 0039d316-1c4b-4281-b951-d872f2087c98
* Changes to fix /core on GCC with all warnings turned on.maf@google.com2009-08-172-42/+40
| | | | | | Review URL: http://codereview.chromium.org/171078 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23593 0039d316-1c4b-4281-b951-d872f2087c98
* Change selenium to run the samples from the artifactsgman@google.com2009-08-175-35/+52
| | | | | | | | | | | | | | | directory. Note: There is the issue that the scons build does not have the correct dependencies to make sure the samples get copied to the artifacts before selenium runs. If that's a 1 line fix then let's add it. Otherwise we can fix that in the gyp build? Review URL: http://codereview.chromium.org/172008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23565 0039d316-1c4b-4281-b951-d872f2087c98
* Remove Yux's modified version of the converter from the build, since it ↵maf@google.com2009-08-171-1/+1
| | | | | | | | causes a build breakage. Review URL: http://codereview.chromium.org/172051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23557 0039d316-1c4b-4281-b951-d872f2087c98
* Change StreamBank to inherit from VertexSourcegman@google.com2009-08-1713-197/+179
| | | | | | | | in preparation for Morph Targets Review URL: http://codereview.chromium.org/164483 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23541 0039d316-1c4b-4281-b951-d872f2087c98
* Add missing performance.js to MANIFESTgman@google.com2009-08-141-0/+1
| | | | | | | | | This is for the trunk. The previous CL was for the release branch. Review URL: http://codereview.chromium.org/170009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23477 0039d316-1c4b-4281-b951-d872f2087c98
* Add edges in collada model to represent the outline.yux@google.com2009-08-148-0/+959
| | | | | | | | | This utility is independent from o3d. Input and output are all collada files. Review URL: http://codereview.chromium.org/169007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23467 0039d316-1c4b-4281-b951-d872f2087c98
* Duplicate converter with add extra edge feature.yux@google.com2009-08-1421-0/+2526
| | | | | | Review URL: http://codereview.chromium.org/164488 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23466 0039d316-1c4b-4281-b951-d872f2087c98
* Updating gyp version.bradnelson@google.com2009-08-141-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23462 0039d316-1c4b-4281-b951-d872f2087c98
* Change to O3D IMC code so UPDATE_TEXTURE2D_RECT has gman@google.com2009-08-146-300/+341
| | | | | | | | | | | | | | | | | | a pitch which allows you to send a sub rect of a source rectangle. Also fixed a bug in UPDATE_TEXTRE2D so it works as it used to. They used to send 1280x199+200 bytes to update the first 320x200 area of a 1280x720 texture. I broke that in a previous build. Finally I changed the declarations in message_command.h to be C++ compatible. The offsetof macro does not work if a class has a constructor. Review URL: http://codereview.chromium.org/165503 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23402 0039d316-1c4b-4281-b951-d872f2087c98
* Changes needed to get Mac plugin gyp project build compiling and linking.maf@google.com2009-08-139-30/+58
| | | | | | Review URL: http://codereview.chromium.org/165433 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23375 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for gyp release build.gman@google.com2009-08-131-2/+2
| | | | | | | | | | | Apparently the compiler optimized unique_ in InterfaceTraits to all point to the same thing since it was marked as const. Making it non-const seems to fix it. Review URL: http://codereview.chromium.org/165419 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23369 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes for POT only systemsgman@google.com2009-08-132-4/+8
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23312 0039d316-1c4b-4281-b951-d872f2087c98
* Lots of changes needed to build with GCC in Chrome.maf@google.com2009-08-125-832/+836
| | | | | | Review URL: http://codereview.chromium.org/164364 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23246 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Linux build break from r23051.tschmelcher@google.com2009-08-121-1/+1
| | | | | | Review URL: http://codereview.chromium.org/165410 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23241 0039d316-1c4b-4281-b951-d872f2087c98
* gcc fixesgman@google.com2009-08-121-36/+41
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23175 0039d316-1c4b-4281-b951-d872f2087c98
* ...gman@google.com2009-08-122-58/+65
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23156 0039d316-1c4b-4281-b951-d872f2087c98
* A few more cleanup items for bitmap andgman@google.com2009-08-124-13/+107
| | | | | | | message_Commands git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23138 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for GLgman@google.com2009-08-121-8/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23132 0039d316-1c4b-4281-b951-d872f2087c98
* Fix so we don't attempt to generate mips for DXTgman@google.com2009-08-124-1/+19
| | | | | | | | | | | | | | textures. This is a quick fix to get pulse passing again. I'm going to make the change I suggested before which is to always allocate enough memory for mips. Then I can make Bitmap::GenerateMips fail and when it fails it won't update the number of mips Review URL: http://codereview.chromium.org/164362 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23122 0039d316-1c4b-4281-b951-d872f2087c98
* Put IMC back to ignore size because GTV is sendinggman@google.com2009-08-111-16/+19
| | | | | | | bad messages and they don't want to fix their code?!? git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23119 0039d316-1c4b-4281-b951-d872f2087c98
* Changes to Bitmap before exposing to JavaScriptgman@google.com2009-08-1139-1311/+1229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL changes Bitmap to no longer be a cubemap. Instead there is a function, Pack::CreateBitmapsFromRawData that returns an array of bitmaps. For a 2D image 1 bitmap is returned For a cubemap 6 bitmaps are returned eventually for a volumemap N bitmaps will be returned. To distinguish between 6 bitmaps that are a cubemap and 6 bitmaps that are slices of a volumemap there is a Bitmap::semantic which tells what the bitmap is intended for. In a previous CL I had started to break Bitmap into classes like Bitmap8, BitmapFloat, BitmapDXT1. These were not intended to be exposed to JavaScript, only to make the internal code get rid of lots of if format == or case(format) stuff. But given that it's working as is and there are more pressing things I'm not planning to do that right now. I can delete the classes if you think I should. Note: This is still not 100% done. I still need to deal with the flipping issues or at least test. I probably need to add more tests as well. I also got rid of any mention of resize_to_pot in the command buffer version. Client side command buffer should not have to deal with POT/NPOT issues. I also moved the pot/npot stuff out of generic code and into the platform specific code. The generic code is not supposed to care. This is slower than the old way but it feels cleaner. A few issues I'm looking for input on. There's a function, Bitmap::GenerateMips(source_level, num_levels). It generates mips as long as they 8Bit textures. I can easily add half and float but not DXT. Right now if you call it on DXT in debug it prints a LOG message but otherwise it does nothing. Should I error for DXT? On the one hand it would be good to know that it failed so a user will not be wondering "I called it, why are there no mips?" On the otherhand, from JavaScript failing would mean you'd need to check the format before calling it which also seems less then ideal. The other is that currently it doesn't ADD mips, it just replaces the ones that are there. That means if you load a 2d image and want mips you have to allocate a new bitmap with the number of mips you want, copy level 0 from the old bitmap to the new bitmap and then generate mips Should I make generate mips effectively do that for you? Basically, if you call it to generate mips on levels that don't yet exist in the bitmap it would realloc itself and then generate them. Is that better? Also, I started down the path of taking out alpha_is_one. I'm trying to decide what to do with it. Part of me wants to take it out completely but since it's already there maybe I can't. If I leave it in I was thinking of making it check every time it's called. First I'd just make it slow. Then later if we want I could add a dirty flag and only recheck when it's dirty. That would be a lot of work though. It would mean wrapping Lock and SetRect and maybe a few other things so that we could catch any writes to the texture. It might also mean changing Lock to take read/write flags. I think those are good changes but again, it's not important right now. So, the question is what to do now. I can 1) Remove alpha_is_one. That might break something out there 2) Leave it in but just have it always false. 3) Make it check every time it's accessed. 4) Do the dirty flag thing. Preference? I'm for 2 or 3 I think. Review URL: http://codereview.chromium.org/164235 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23051 0039d316-1c4b-4281-b951-d872f2087c98
* Change Force Software Render to also use environment variablegman@google.com2009-08-111-28/+3
| | | | | | | | | | so there's a hermetic option. Should I delete the registry stuff? It seems like it's not needed. Review URL: http://codereview.chromium.org/165221 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23044 0039d316-1c4b-4281-b951-d872f2087c98
* Fix texture-set-test for IEgman@google.com2009-08-111-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23000 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing signed/unsigned compare warning failing under gyp build.bradnelson@google.com2009-08-111-2/+2
| | | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/165284 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22995 0039d316-1c4b-4281-b951-d872f2087c98
* Moving the copy of d3dx_36.dll to a common location.bradnelson@google.com2009-08-112-16/+26
| | | | | | | | | | | | | Making it a copy by using a checked in copy if available or falling back on the system copy otherwise. BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/164297 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22993 0039d316-1c4b-4281-b951-d872f2087c98
* Add UpdateTexure2DRect to IMCgman@google.com2009-08-1110-432/+984
| | | | | | | | | | | | | | | | | | | | | | Also refactored IMC for to be more safe and easy to use. It still needs: *) structures/wrappers for message responces *) Some of the error checking could probably be moved out of the inidivdual message processing functions *) Need some constants or wrappers for the handles so a message isn't pulling things out of handles by magic numbers. Review URL: http://codereview.chromium.org/165266 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22987 0039d316-1c4b-4281-b951-d872f2087c98
* Pulling in newer version of gyp.bradnelson@google.com2009-08-101-1/+1
| | | | | | | | | | BUG=None TESTS=None TBR=gspencer Review URL: http://codereview.chromium.org/165259 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22950 0039d316-1c4b-4281-b951-d872f2087c98
* Add Breakpad to the Mac GYP build.maf@google.com2009-08-101-0/+7
| | | | | | Review URL: http://codereview.chromium.org/165204 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22920 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed some warnings in bitmap_png.ccbradnelson@google.com2009-08-105-5/+23
| | | | | | | | | | | | | | Switched to using the latest nacl and using their gyp files. Added a copy/rename step so that o3dConverter gets the dll it needs for other build steps. BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/164238 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22891 0039d316-1c4b-4281-b951-d872f2087c98
* Now that chromium's common.gypi sets /MP when building under vs2008,bradnelson@google.com2009-08-101-5/+0
| | | | | | | | | | | | | | it shouldn't be assumed that /MP should be set for O3D. In particular this can disrupt O3D being build on the buildbot infrastructure which uses VS2005 builders. BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/164237 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22890 0039d316-1c4b-4281-b951-d872f2087c98
* Changing run hook for gyp so that depth as at the right level.bradnelson@google.com2009-08-091-1/+1
| | | | | | | | | | | | | | | Unlike gyp files, the hooks are run at the level the .gclient file is at. So you want --depth=. (not ..) This was causing the path to the platform sdk used in chromium's common.gypi to be wrong. BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/164236 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22889 0039d316-1c4b-4281-b951-d872f2087c98
* Add return type to docs for getRectgman@google.com2009-08-081-0/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22872 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-0835-149/+572
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Fix for GL path not clearing texturesgman@google.com2009-08-082-33/+30
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22867 0039d316-1c4b-4281-b951-d872f2087c98
* half fix for mac.gman@google.com2009-08-082-4/+9
| | | | | | | | | For some reason when getting values back out of a luminance texture the signs are all ABSed out even though the texture displays correctly git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22866 0039d316-1c4b-4281-b951-d872f2087c98
* Add nonPowerOfTwoTextures to clientInfogman@google.com2009-08-088-7/+64
| | | | | | | | | so that video can decide to use power of 2 if it needs to. Review URL: http://codereview.chromium.org/164210 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22860 0039d316-1c4b-4281-b951-d872f2087c98
* 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
generated by cgit v1.1 at 2025-02-12 19:06:05 +0000