summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* Since loading textures from a file request isgman@google.com2009-09-041-8/+15
| | | | | | | | deprecated update the docs to match. Review URL: http://codereview.chromium.org/198033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25542 0039d316-1c4b-4281-b951-d872f2087c98
* Fix bug in Texture2D::Set and TextureCUBE::Setgman@google.com2009-09-041-2/+7
| | | | | | Review URL: http://codereview.chromium.org/198032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25539 0039d316-1c4b-4281-b951-d872f2087c98
* Enable gmock on windows scons buildgman@google.com2009-09-041-27/+12
| | | | | | | | | I made these changes and build both test-dbg-d3d and dbg-cb and no errors. Review URL: http://codereview.chromium.org/199033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25537 0039d316-1c4b-4281-b951-d872f2087c98
* Switch to chrome gmock. gman@google.com2009-09-041-1/+2
| | | | | | | | | | I build this on osx and it worked so it should be find on Windows. Windows is not currently using gmock so it should still work there as well. Review URL: http://codereview.chromium.org/194030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25526 0039d316-1c4b-4281-b951-d872f2087c98
* Add check for offset + number_of_bytes overflowgman@google.com2009-09-041-2/+4
| | | | | | | | | | | | | | | | | | | | to UPDATE_TEXTURE2D and UPDATE_TEXTURE2D_RECT IMC messages. This was moved from issue 199008 beacuse codereview.chromium.org was giving bogus errors C:\src\o3d_outside_pc\o3d>gcl upload fix Upload server: codereview.chromium.org (change with -s/--server) Email [gman@google.com]: Password for gman@google.com: Saving authentication cookies to C:\Documents and Settings\gman\.codereview_upload_cookies Issue creation errors: {'user': ["You (Gman@google.com) don't own this issue (199008)"]} Review URL: http://codereview.chromium.org/192030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25524 0039d316-1c4b-4281-b951-d872f2087c98
* Adding a no-binary path to the o3dConvertergman@google.com2009-09-046-67/+449
| | | | | | | | | | | | | | | | and deserializer. This CL still creates a o3dtgz file, it's just that buffers, skins and curves are stored in JSON instead of binary. I'm not sure how useful this is but it seemed like a possible short cut to testing out some stuff. Another CL will add some flag so there is no gzipped tar file, just the json. Review URL: http://codereview.chromium.org/189003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25523 0039d316-1c4b-4281-b951-d872f2087c98
* Make O3D always clear the backbuffer one way or gman@google.com2009-09-0410-88/+186
| | | | | | | | | | | | | | another. The issue is that given that we are using DISCARD on D3D and on GL we are only drawing to the visible portion of the O3D area, the state of the backbuffer is undefined. This change should make it consistent across platforms. Review URL: http://codereview.chromium.org/201013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25522 0039d316-1c4b-4281-b951-d872f2087c98
* This adds in targets for selenium and updated several other problems,gspencer@google.com2009-09-0422-365/+878
| | | | | | | | | | | including some problems with the samples and idl generation. Selenium targets launch selenium on all platforms, but the tests don't pass anywhere but Windows yet because the plugin isn't found. I'll work on that next. Review URL: http://codereview.chromium.org/197014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25467 0039d316-1c4b-4281-b951-d872f2087c98
* Fix _H__ to correct _H_gman@google.com2009-09-0420-60/+60
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25419 0039d316-1c4b-4281-b951-d872f2087c98
* Exracted CommandBuffer class from GPUPluginObject.apatrick@google.com2009-09-039-120/+314
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/200005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25348 0039d316-1c4b-4281-b951-d872f2087c98
* Change Mac O3D executable name (the actual name of the binary inside the ↵maf@google.com2009-09-032-15/+15
| | | | | | | | | | bundle) to O3D, not o3d. This matches the name it gets in the GYP build and enabled them to share an Info.plist file (also changed in this CL in the same way). Add include dir for the Breakpad header to scons, so it can cope with us #including "Breakpad.h" as required by the GYP build, rather than <Breakpad/Breakpad.h>. Review URL: http://codereview.chromium.org/200002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25339 0039d316-1c4b-4281-b951-d872f2087c98
* Make Convertor project compile in GCC - fixes release-build only compiler ↵maf@google.com2009-09-032-219/+219
| | | | | | | | errors. Review URL: http://codereview.chromium.org/197003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25333 0039d316-1c4b-4281-b951-d872f2087c98
* Fix other things blocking the Mac GYP release build from completing.maf@google.com2009-09-032-1/+5
| | | | | | Review URL: http://codereview.chromium.org/194005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25332 0039d316-1c4b-4281-b951-d872f2087c98
* Generates a class hierarchy using graphviz "dot", thegman@google.com2009-09-035-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same tool that doxygen uses. This is not ready for primetime but I had already looked at this and it didn't look to hard so I stuck it in. With this CL nothing will happen unless graphviz is added to third_party/graphviz/files but I wanted to at least check in what has to happen so that if someone else wants to finish it they can. Basically jsdoctoolkit generates a .dot file that lists the inheritance, that is passed to dot which creates a png and a map file for a client side image map. To actually use it online would require inserting the map file into an html file, probably using EZT or python. Otherwise, to be useful we'd need to split the template into ParamMatrix4 and its derived classes, Param and its derived classes. RenderNode and its derived classes, ParamObject and its derived classes and then finally everything not covered by the above. Otherwise the chart is too big. http://www/~gman/images/class_hierarchy.png To be honest though, given it's just a tree a simple HTML page could also do this without the graphing. Just a simple -NamedObject | +-Param | +--ParamFloat | +--ParamInteger etc. Nearly as simple would be to save the data to JSON and graph it in JavaScript live in the browser using canvas or O3D. That would be a lot smaller than the 9meg for the binary parts of graphviz Review URL: http://codereview.chromium.org/174384 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25315 0039d316-1c4b-4281-b951-d872f2087c98
* Adding uninstall.sh script to be included in self-extracting archive. This ↵nmaxwell@google.com2009-09-032-2/+127
| | | | | | | | will get called within the setup.sh script to uninstall previous versions of O3D. Can also be manually invoked by a user directly to remove files. Review URL: http://codereview.chromium.org/171128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25297 0039d316-1c4b-4281-b951-d872f2087c98
* Get Mac GYP build compiling.maf@google.com2009-09-037-143/+154
| | | | | | Review URL: http://codereview.chromium.org/172119 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25292 0039d316-1c4b-4281-b951-d872f2087c98
* This changes the selenium driver script to not be so scons-specific, andgspencer@google.com2009-09-033-34/+79
| | | | | | | | | | | | | | | | makes it so that it will self-locate some of the things it needs (for instance, it no longer needs to have PYTHONPATH env var set correctly -- it'll find the third party dir relative to itself and add gflags to the path). As part of this, it now copies the selenium tests into the artifacts directory so it can run them out of that directory instead of from the source dir. This is so that we can use the product dir as the root of the http server, since in GYP all three platforms have different locations for their output, and different working directories during the build. Review URL: http://codereview.chromium.org/180074 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25288 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing GYP build. Warning generated by this code was treated as error at ↵vangelis@google.com2009-09-031-1/+1
| | | | | | | | compile time. Review URL: http://codereview.chromium.org/197002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25287 0039d316-1c4b-4281-b951-d872f2087c98
* This CL adds the createRawDataFromDataURL function to o3d.Pack. The functionmstrydom@google.com2009-09-0213-2/+506
| | | | | | | | | | 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
* Fixing mac and linux buildvangelis@google.com2009-09-022-4/+6
| | | | | | Review URL: http://codereview.chromium.org/186020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25247 0039d316-1c4b-4281-b951-d872f2087c98
* Wrote tests for GPUPluginObject::OpenCommandBuffer.apatrick@google.com2009-09-0214-58/+498
| | | | | | | | | TEST=none BUG=none Review URL: http://codereview.chromium.org/188015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25244 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes for accidental early commit reviewed at URL below.apatrick@google.com2009-09-026-6/+91
| | | | | | | | | | http://codereview.chromium.org/177060 TEST=none BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25203 0039d316-1c4b-4281-b951-d872f2087c98
* Beginnings of direct manipulator support in o3djs library. Addedkbr@google.com2009-09-024-5/+1202
| | | | | | | | | | | | | Translate1 manipulator, which implements dragging along a line, and helper and base classes. This is a work in progress; feedback appreciated. Fixed problem in recently changed documentation in primitives.js. Minor documentation cleanup in primitives.html. Review URL: http://codereview.chromium.org/178044 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25152 0039d316-1c4b-4281-b951-d872f2087c98
* Fixing path in call to version_info.pybradnelson@google.com2009-09-021-1/+1
| | | | | | | | | | BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/185004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25150 0039d316-1c4b-4281-b951-d872f2087c98
* GPU plugin object can create a command buffer via a V8 extension in Chromium ↵apatrick@google.com2009-09-0235-962/+1707
| | | | | | | | | | | | and return it via NPAPI. Introduced NPBrowser class to abstract functions provided by browser to plugin, including Chromium extensions. NPBrowser is stubbed for tests. TEST=none BUG=none Review URL: http://codereview.chromium.org/177060 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25135 0039d316-1c4b-4281-b951-d872f2087c98
* Adds GET_VERSION IMC message.gman@google.com2009-09-029-66/+289
| | | | | | Review URL: http://codereview.chromium.org/180071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25130 0039d316-1c4b-4281-b951-d872f2087c98
* Rename render_width and render_height to display_widthgman@google.com2009-09-014-25/+25
| | | | | | | | | | | | | | and display_height in preparation for letting the user choose the backbuffer size. The issue is the current "render_width" and "render_height" really mean display_width and display_height where as the true "render_width" and "render_height" need to be different. Review URL: http://codereview.chromium.org/179058 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25070 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for param array support in effects for GLgman@google.com2009-09-011-1/+2
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25022 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes for texture locking.gman@google.com2009-09-014-11/+5
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25018 0039d316-1c4b-4281-b951-d872f2087c98
* Update samples to use more utility functions wheregman@google.com2009-09-0131-633/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | appropriate. A few places used pseudoRandom. That is in math.js now so they use that. Other places there is now o3djs.material.createBasicMaterial and o3djs.material.createMaterialFromFile that save 10-20 lines per sample. This CL will require new reference images. There are 2 other things I'd like to consider. #1) Changing every sample that uses shaders/texture-only.shader to use o3djs.material.createConstantMaterial or some variation. The problem with o3djs.material.createConstantMaterial is it requires you pass it a texture if you want a constant textured material. All the samples create the material first, then later add the texture. So, I could add a new o3djs.material.createTextureOnlyMaterial. At the same time that would mean changing those samples from setting stuff on 'texSampler0' to 'emissive' #2) I'd like to change the shader builder so it stops adding "Sampler" to textured materials. As it is if the material uses a color it makes the param called "diffuse" but if it's a texture it makes it "diffuseSampler". That sucks because it means the code has to do crap like var param = material.getParam('diffuse'); if (param) { // it's a color } else { param = material.getParam('diffuseSampler'); if (param) { // it's a texture. } } If we stopped that silliness we could just do var param = material.getParam('diffuse'); if (param) { if (param.isA('o3d.ParamTexture')) { // it's textured. } else { // it's not. } } Unfortunately to fix this requires changing the o3dConverter as well since it uses those conventions. Should we do this? Review URL: http://codereview.chromium.org/182024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25015 0039d316-1c4b-4281-b951-d872f2087c98
* Update Texture::Lock to take an AccessMode.gman@google.com2009-09-0114-326/+395
| | | | | | | | | | | | | | | | | | Also, split Lock/Unlock into common and platform specific parts. This is needed to work around an apparent bug in mac drivers where glGetTexImage apparently doesn't always work. This doesn't solve the issue unless we disallow READ completely. Not sure what to about that except make a small GL sample and report the bug to Apple. Review URL: http://codereview.chromium.org/173640 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25012 0039d316-1c4b-4281-b951-d872f2087c98
* Switching DISPLAY_MODE_DEFAULT to create to a non-full-screen window at the ↵vangelis@google.com2009-08-311-7/+15
| | | | | | | | | | | current display resolution. This makes switching in and out of full screen smoother. A followup CL will allow the application code to specify the max backbuffer size to get cheaper (from the GPU/pixel shader perspective) full screen rendering. Review URL: http://codereview.chromium.org/177007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24940 0039d316-1c4b-4281-b951-d872f2087c98
* up cullingzsort stress test pdiff thresholdgman@google.com2009-08-311-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24926 0039d316-1c4b-4281-b951-d872f2087c98
* Prep for ascii only converter optiongman@google.com2009-08-313-5/+17
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24921 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for Canvas::DrawBitmap that I broke when addinggman@google.com2009-08-311-1/+1
| | | | | | | | adding pitch to Texture2D::Lock Review URL: http://codereview.chromium.org/177029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24907 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for archive request. It turns out this thinggman@google.com2009-08-316-36/+54
| | | | | | | | | | | | | | can be called recursively. Because of that ArchiveRequest::raw_data_ would be invalid when the outer call came back. This way we mostly don't use that field. Also updated the docs so it can me marked as deprecated. Review URL: http://codereview.chromium.org/173620 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24906 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for mac setRect?gman@google.com2009-08-291-0/+4
| | | | | | Review URL: http://codereview.chromium.org/180030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24849 0039d316-1c4b-4281-b951-d872f2087c98
* Fix syntax accessing enum scoped to class, to fix GCC builds.maf@google.com2009-08-281-1/+1
| | | | | | Review URL: http://codereview.chromium.org/183007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24832 0039d316-1c4b-4281-b951-d872f2087c98
* Adding in render surfaces for command buffers. Fixing SetRect as well.rlp@google.com2009-08-2821-501/+1820
| | | | | | Review URL: http://codereview.chromium.org/160401 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24825 0039d316-1c4b-4281-b951-d872f2087c98
* increase threshold setting for culling testsgman@google.com2009-08-281-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24815 0039d316-1c4b-4281-b951-d872f2087c98
* Adding back in breakpad upload.bradnelson@google.com2009-08-282-0/+14
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/175016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24814 0039d316-1c4b-4281-b951-d872f2087c98
* Bump version to 0.1.42gman@google.com2009-08-282-2/+2
| | | | | | | | | | This is partly so video can distinguish between 0.1.41 which they pushed internally and 0.1.42 which will be our next push. Review URL: http://codereview.chromium.org/179015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24782 0039d316-1c4b-4281-b951-d872f2087c98
* Fixes toDataURL for GL by making it all work throughgman@google.com2009-08-2822-380/+492
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | O3D. What happens is client.toDataURL creates a RenderSurface and DepthSurface, sets those as the current Surface then renders. It then calls Surface::GetBitmap to get the pixels in the bitmap. The complications are 1) I needed to make Renderer::StartRendering / Renderer::FinishRendering be nestable because the Renderer::SetRenderSurface required StartRendering to already have been called. I didn't see a cleaner way to do this but I'm happy to change it if you have a better idea. 2) Since we can only create POT RenderSurfaces I added a clip_width / clip_height to render surfaces. Renderer::SetViewport uses these values so we end up rendering correctly to the top/left area of the POT render surface. 3) Doing it this way means that screenshots are NOT anti-aliased. I feel like that issue can be handled later. It's more important that toDataURL work now than it have the ultimate best results. (I hope). It probably means I'll need to create all new reference images. 4) I was wondering we we should expose SetClipWidth to JavaScript. Given that we require POT render surfaces they should always get the same results on all hardware. Or, rather, we could just allow the user to create NPOT RenderSurfaces. Under the hood they'd get a POT surface but the clip_width/clip_height would be set to the size the requested. There would have to be a note that texture wrapping only works if the size if POT. 5) I had to split FinishRendering into FinishRendering and Present since when taking a screenshot nothing will be drawn to the backbuffer and so I don't want a present to happen. Review URL: http://codereview.chromium.org/174594 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24781 0039d316-1c4b-4281-b951-d872f2087c98
* up the threshold for hellocube-texturegman@google.com2009-08-281-1/+1
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24707 0039d316-1c4b-4281-b951-d872f2087c98
* Bump the revision number in DEPS so we get new pdiff.maf@google.com2009-08-271-1/+1
| | | | | | Review URL: http://codereview.chromium.org/177011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24687 0039d316-1c4b-4281-b951-d872f2087c98
* o3d plugin was mistakenly being built as a static library when built outside ↵bradnelson@google.com2009-08-271-10/+1
| | | | | | | | | | | | | | of chrome. This was preventing the installer from baking it in. BUG=None TEST=None TBR=gspencer Review URL: http://codereview.chromium.org/173591 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24666 0039d316-1c4b-4281-b951-d872f2087c98
* Move the build group addition out of the AddMacDebugSettings function.maf@google.com2009-08-271-3/+9
| | | | | | | | This was adding all Mac debug builds to the default build group, so we were trying to build the work-in-progress command buffer version and failing. Review URL: http://codereview.chromium.org/174628 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24665 0039d316-1c4b-4281-b951-d872f2087c98
* Fix code in effect_helper.cc that does not compile in GCC. maf@google.com2009-08-271-3/+6
| | | | | | Review URL: http://codereview.chromium.org/174597 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24639 0039d316-1c4b-4281-b951-d872f2087c98
* temp fix for bug with compressed texture clearinggman@google.com2009-08-271-19/+20
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24631 0039d316-1c4b-4281-b951-d872f2087c98
* Clear textures on creation for D3D because it gman@google.com2009-08-271-0/+41
| | | | | | | | does not Review URL: http://codereview.chromium.org/174530 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24603 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-02-13 01:56:32 +0000