summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* Linux: Make the Debian package build rules work with both Make and SCons.tschmelcher@chromium.org2010-05-101-10/+9
| | | | | | | | | TEST=built on Linux with both Make and SCons BUG=none Review URL: http://codereview.chromium.org/1997008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46846 0039d316-1c4b-4281-b951-d872f2087c98
* Axe the o3d_version.py script and turn it into a .gypi file. This fixes a ↵tschmelcher@chromium.org2010-05-069-82/+66
| | | | | | | | | | | | | bug where bumping the version wasn't always picked up by the build slaves because hooks are only re-run when a GYP file changes. Also axe the o3d_kill_version.py and the separate SDK version logic, which was not used anymore. TEST=built on Linux; trybots BUG=none Review URL: http://codereview.chromium.org/2017004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46609 0039d316-1c4b-4281-b951-d872f2087c98
* Added setLanguage functions to canvas, fps and particles. Added ↵amarinichev@chromium.org2010-05-0623-106/+7106
| | | | | | | | beachdemo-glsl and its shaders. Review URL: http://codereview.chromium.org/1894001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46579 0039d316-1c4b-4281-b951-d872f2087c98
* Grr, change last CL to define ChangeResolution as a target with type of none ↵tschmelcher@chromium.org2010-05-051-8/+9
| | | | | | | | | | | on non-Windows, because that is the only way to keep both the "make" and XCode generators happy. TEST=built on Linux and Mac BUG=none Review URL: http://codereview.chromium.org/2000001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46504 0039d316-1c4b-4281-b951-d872f2087c98
* Only define the ChangeResolution target on Windows. This fixes a problem ↵tschmelcher@chromium.org2010-05-051-8/+16
| | | | | | | | | | | | where the make generator on the buildbots was trying to build the target on Linux. Committing without code review because the code review server is down. TEST=built all targets on Linux BUG=none git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46488 0039d316-1c4b-4281-b951-d872f2087c98
* Flush GL errors before any operation that checks for GL errors afterwards, ↵tschmelcher@chromium.org2010-05-056-26/+71
| | | | | | | | | | | so as to prevent operations from spuriously failing due to previous unrelated errors. Fixes a bug on Linux T400s with AMD graphics where we "failed" to create the error texture because of a previous non-fatal error that hadn't been reaped. TEST=ran a debug build on a Linux T400 with AMD graphics BUG=none Review URL: http://codereview.chromium.org/1912001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46418 0039d316-1c4b-4281-b951-d872f2087c98
* Small changes to make GCC 4.4.1 happy.zhurunz@google.com2010-05-043-4/+10
| | | | | | Review URL: http://codereview.chromium.org/1908003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46306 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: make gypbuild use make now that that's the default GYP generator.tschmelcher@chromium.org2010-05-041-7/+3
| | | | | | | | | TEST=build on Linux and ran trybots BUG=none Review URL: http://codereview.chromium.org/1833003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46301 0039d316-1c4b-4281-b951-d872f2087c98
* Compute the absolute path containing the o3dConverter tool for thekbr@google.com2010-05-031-1/+6
| | | | | | | | | | | | case where it is being run from the current working directory and "." is not on the PATH. BUG=none TEST=none Review URL: http://codereview.chromium.org/1896001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46294 0039d316-1c4b-4281-b951-d872f2087c98
* Quote the path to the temporary file containing the Cg shader to fixkbr@google.com2010-05-031-1/+9
| | | | | | | | | | | | problems in particular on Windows XP where the temporary directory path contains spaces. BUG=none TEST=none Review URL: http://codereview.chromium.org/1872003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46277 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed renderer_test.cc for GLES2.amarinichev@chromium.org2010-05-032-0/+11
| | | | | | Review URL: http://codereview.chromium.org/1830004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46268 0039d316-1c4b-4281-b951-d872f2087c98
* Bump version to turn on SET_MAX_FPS.zhurunz@google.com2010-05-031-1/+1
| | | | | | Review URL: http://codereview.chromium.org/1875002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46239 0039d316-1c4b-4281-b951-d872f2087c98
* Refactored event handling code gman added to simpleviewer.html intokbr@google.com2010-04-302-98/+130
| | | | | | | | | | | | | | client.js. Fixed bug where window.event was being overwritten, which for some reason broke key event handling in Firefox even though the event wrapper wasn't being used. Tested pool sample in Firefox, WebKit and Chromium. BUG=none TEST=none Review URL: http://codereview.chromium.org/1826002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46140 0039d316-1c4b-4281-b951-d872f2087c98
* Merged in gman's fixes to make o3d-webgl samples work in Firefox.kbr@google.com2010-04-306-14/+123
| | | | | | | | | | | | | Resized poolballs.png to power-of-two dimensions. Retested all o3d-webgl samples in top of tree Firefox, WebKit and Chromium. BUG=none TEST=none TBR=gman,petersont Review URL: http://codereview.chromium.org/1695031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46100 0039d316-1c4b-4281-b951-d872f2087c98
* Advancing to latest gyp.bradnelson@google.com2010-04-302-60/+5
| | | | | | | | Reverting 46012. Review URL: http://codereview.chromium.org/1815003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46082 0039d316-1c4b-4281-b951-d872f2087c98
* Incorporated gman's CSS changes for resizing and placing thekbr@google.com2010-04-301-6/+29
| | | | | | | | | | | instructions at the bottom of the page. BUG=none TEST=ran pool sample Review URL: http://codereview.chromium.org/1706020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46022 0039d316-1c4b-4281-b951-d872f2087c98
* Added pool ball image to MANIFEST.kbr@google.com2010-04-301-0/+1
| | | | | | | | | | BUG=none TEST=ran built pool sample TBR=petersont Review URL: http://codereview.chromium.org/1812006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46019 0039d316-1c4b-4281-b951-d872f2087c98
* Roll forward DEPS for assets to pick up dummy dependencies currentlykbr@google.com2010-04-301-1/+1
| | | | | | | | | | | | needed for WebGL asset conversion. BUG=none TEST=built on Windows TBR=gman Review URL: http://codereview.chromium.org/1755019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46016 0039d316-1c4b-4281-b951-d872f2087c98
* Worked around bug in directory copying support in gyp MSVS generatorkbr@google.com2010-04-291-4/+59
| | | | | | | | | | | | by enumerating all files needing to be copied. BUG=none TEST=built on Windows TBR=gman Review URL: http://codereview.chromium.org/1695030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46012 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed problem with some parameters being optimized away by the GLSLkbr@google.com2010-04-291-4/+12
| | | | | | | | | | | | compiler. BUG=none TEST=ran o3d-webgl pool on Windows with NVIDIA hardware already reviewed=petersont Review URL: http://codereview.chromium.org/1748017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46010 0039d316-1c4b-4281-b951-d872f2087c98
* Reorganized dependencies in generated samples_gen.gyp so that thekbr@google.com2010-04-291-6/+32
| | | | | | | | | | | | | | | conversion step always occurs before the copying step, which fixes a build problem on Windows. Worked around a gyp issue on Windows to properly convert both the plugin and WebGL versions of a couple of the assets. BUG=none TEST=built on Windows TBR=gman Review URL: http://codereview.chromium.org/1801008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46002 0039d316-1c4b-4281-b951-d872f2087c98
* Added culling sample.petersont@google.com2010-04-2914-79/+772
| | | | | | Review URL: http://codereview.chromium.org/1703014 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45993 0039d316-1c4b-4281-b951-d872f2087c98
* Added pool, fixed a bug in Bitmap (or to be precise, kbr fixed the bug). ↵petersont@google.com2010-04-294-5/+2155
| | | | | | | | Flipping a bitmap vertically was deferred to the texture, which is fine, unless the bitmap actually gets modified before the texture gets made, so now flipVertically() actually flips the image. Review URL: http://codereview.chromium.org/1699021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45960 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed output directory for converted WebGL assets. Something stillkbr@google.com2010-04-291-1/+1
| | | | | | | | | | | | appears to be broken in the Windows build, however. BUG=none TEST=built on Mac, attempted build on Windows TBR=gman Review URL: http://codereview.chromium.org/1699024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45903 0039d316-1c4b-4281-b951-d872f2087c98
* Review URL: http://codereview.chromium.org/1798009petersont@google.com2010-04-291-36/+79
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45899 0039d316-1c4b-4281-b951-d872f2087c98
* Copy WebGL compatible assets to output directory during the build.kbr@google.com2010-04-292-0/+27
| | | | | | | | | | | | | | Manually copy webgl.js to output directory because we are not prepared to run the documentation generation on this file yet. All o3d-webgl samples now run out of the build directory. BUG=none TEST=ran o3d-webgl samples out of build directory TBR=gman Review URL: http://codereview.chromium.org/1796004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45897 0039d316-1c4b-4281-b951-d872f2087c98
* Fleshed out sampler implementation a bit.petersont@google.com2010-04-293-14/+115
| | | | | | Review URL: http://codereview.chromium.org/1759012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45893 0039d316-1c4b-4281-b951-d872f2087c98
* Copy o3d-webgl and o3d-webgl-samples into the build directory whilekbr@google.com2010-04-291-0/+32
| | | | | | | | | | | | building the samples. BUG=none TEST=ran build on Mac, verified files were copied TBR=gman Review URL: http://codereview.chromium.org/1742016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45891 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed bug in effect.js during lookup of attribute locations. Fixedkbr@google.com2010-04-291-8/+8
| | | | | | | | | | | | variable scoping problems making debugging more difficult. BUG=none TEST=none TBR=petersont Review URL: http://codereview.chromium.org/1758015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45890 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed samples to work with resizing code introduced yesterday. Now thekbr@google.com2010-04-289-13/+57
| | | | | | | | | | | | | | | setup of the containing div is identical to that in the plugin version of O3D. Fixed createClients to only call the initialization callback once the client's initial size has been set. Fixed bug in texture wrap mode setup which was breaking the bump map in helloworld.html. BUG=none TEST=ran all o3d-webgl samples TBR=petersont Review URL: http://codereview.chromium.org/1687019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45866 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed bug in samples conversion introduced by WebGL-related changes andkbr@google.com2010-04-281-2/+10
| | | | | | | | | | | | | caught by Linux try bots. Need to specify a different output than the non-WebGL target for the same asset, because otherwise multithreaded builds choose one or the other target to execute. BUG=none TEST=reran build Review URL: http://codereview.chromium.org/1723019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45837 0039d316-1c4b-4281-b951-d872f2087c98
* Addressing review feedback on last changes.kbr@google.com2010-04-281-28/+31
| | | | | | | | | BUG=none TEST=none (ran converter script) Review URL: http://codereview.chromium.org/1687015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45830 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed bug in naming of texCoord[0..7] parameters discovered by petersont.kbr@google.com2010-04-281-4/+4
| | | | | | | | | | BUG=none TEST=none TBR=amarinichev Review URL: http://codereview.chromium.org/1696015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45772 0039d316-1c4b-4281-b951-d872f2087c98
* Thanks to gman, fixed o3d.webgl.createClient and o3d-webgl Client to handlekbr@google.com2010-04-283-4/+394
| | | | | | | | | | | resizing of div containing O3D element. Added simpleviewer sample. BUG=none TEST=ran simpleviewer sample Review URL: http://codereview.chromium.org/1798006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45770 0039d316-1c4b-4281-b951-d872f2087c98
* Dropping obsolete HTTP method for o3d.bradnelson@google.com2010-04-271-2/+0
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/1752016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45756 0039d316-1c4b-4281-b951-d872f2087c98
* Added rules which generate WebGL-compatible assets to samples_gen.py.kbr@google.com2010-04-272-3/+19
| | | | | | | | | | | | | Added conversion step for teapot and cube assets, which are known to work within helloworld.html. Added comment to helloworld.html about enabling the debug rendering context. BUG=none TEST=tested helloworld.html against converted assets Review URL: http://codereview.chromium.org/1793004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45754 0039d316-1c4b-4281-b951-d872f2087c98
* Added more logic to cg_to_glsl converter to find cgc in o3d/third_party/cgc/kbr@google.com2010-04-271-23/+56
| | | | | | | | | | | | | as a last resort. This will allow the converter to always be run as part of the build process. BUG=none TEST=manual testing on Mac and Windows TBR=amarinichev Review URL: http://codereview.chromium.org/1773008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45737 0039d316-1c4b-4281-b951-d872f2087c98
* Pulled changes from issue 669220 to fix building with renderer=gles2.amarinichev@chromium.org2010-04-273-8/+10
| | | | | | Review URL: http://codereview.chromium.org/1741009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45723 0039d316-1c4b-4281-b951-d872f2087c98
* Updated docs for converter.kbr@google.com2010-04-271-5/+30
| | | | | | | | | | BUG=none TEST=none TBR=gman Review URL: http://codereview.chromium.org/1773007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45721 0039d316-1c4b-4281-b951-d872f2087c98
* Remove svn:executable property from the last few files that don't need it.thestig@chromium.org2010-04-271-0/+0
| | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/1746010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45665 0039d316-1c4b-4281-b951-d872f2087c98
* Changed cg_to_glsl converter script to also look in the script'skbr@google.com2010-04-271-0/+7
| | | | | | | | | | | | | | directory for the cgc executable, to match the layout of the prebuilt O3D COLLADA converter binaries which already bundle cgc and its dependent DLLs. BUG=none TEST=verified new searching code manually on Windows and Mac TBR=amarinichev Review URL: http://codereview.chromium.org/1804001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45663 0039d316-1c4b-4281-b951-d872f2087c98
* Copy the Cg-to-GLSL converter script alongside the converterkbr@google.com2010-04-261-0/+13
| | | | | | | | | | | executable during the build process. BUG=none TEST=built and verified that script is copied properly Review URL: http://codereview.chromium.org/1711015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45616 0039d316-1c4b-4281-b951-d872f2087c98
* Thanks to amarinichev for extensive help, ported o3dConverter'skbr@google.com2010-04-243-9/+33
| | | | | | | | | | | | | | | --convert-cg-to-glsl command line option to Windows. Ported to Python 2.4, which is what Cygwin and depot_tools both contain. Fixed regular expression match and cgc.exe determination in Cygwin Python. Added explicit invocation of python.exe to collada.cc. BUG=none TEST=converted teapot sample with --convert-cg-to-glsl on Windows and Mac TBR=amarinichev Review URL: http://codereview.chromium.org/1715009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45525 0039d316-1c4b-4281-b951-d872f2087c98
* Adds --convert-cg-to-glsl to the Collada converter tool.amarinichev@chromium.org2010-04-236-27/+90
| | | | | | Review URL: http://codereview.chromium.org/1750008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45514 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed problem in o3dConverter where it was not outputting all of thekbr@google.com2010-04-236-33/+118
| | | | | | | | | | | | | | | | | | | vertex data in JSON format. Fixed problems in effect.js where GLSL code path needed to name the texture coordinate attributes with the semantic names and not the names like "diffuseUV" because otherwise the backend did not know how to hook them up. Fixed problem with cube map faces being flipped and bug in binding cube map textures. At this point o3d-webgl can load the converted cube and teapot, though the teapot is currently missing the bump map. Tested O3D plugin with this sample to ensure no regression. BUG=none TEST=none Review URL: http://codereview.chromium.org/1729012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45495 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed primitives' glsl shaders: it was missing MatrixLoadOrder directive.amarinichev@chromium.org2010-04-231-7/+16
| | | | | | Review URL: http://codereview.chromium.org/1766002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45459 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed bug pointed out by mihai where success was incorrectly reportedkbr@google.com2010-04-231-2/+7
| | | | | | | | | | | | during shader compilation. Added reporting of link failures. BUG=none TEST=ran some o3d-webgl samples TBR=petersont Review URL: http://codereview.chromium.org/1757006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45408 0039d316-1c4b-4281-b951-d872f2087c98
* Simplification of recent change suggested by amarinichev.kbr@google.com2010-04-221-4/+4
| | | | | | | | | BUG=none TEST=reran against teapot shader Review URL: http://codereview.chromium.org/1705006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45337 0039d316-1c4b-4281-b951-d872f2087c98
* Changed the semantics of many fields throughout the o3d-webglkbr@google.com2010-04-2224-672/+782
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implementation to be backed by Params using o3d.ParamObject.setUpO3DParam_. This change was needed to maintain the semantics of the plugin, where fetching a parameter of a certain name and setting it is equivalent to setting the field against the object. This change mandated moving all of the assignments of the form "constructor.prototype.fieldName = defaultValue" into the constructor function itself, so that the setter created by setUpO3DParam will be properly called for those assignments. For all files touched by this CL, moved all default field assignments, not just those associated with Param-backed fields. Incorporated petersont's setup of the dx_clipping uniform introduced in amarinichev's cg_to_glsl converter. Commented out bogus modification of projection matrix in o3d.Param.SAS.setProjection and added TODO to modify all handwritten shaders. Fixed bug in o3d.Buffer.prototype.resize where it needed to coerce the argument to an integer, a bug in the type determination for arrays in param.js, and a couple of other bugs. Changed cg_to_glsl script to use the expected case for the SAS matrices in the o3d-webgl backend. Hopefully this change will not break the GLES2 backend. Ran all o3d-webgl samples. All work except for shadow-map.html (affected by https://bugs.webkit.org/show_bug.cgi?id=37963 ) and helloworld.html, which now does not report any errors but also does not display any output yet. BUG=none TEST=ran o3d-webgl samples TBR=petersont,amarinichev Review URL: http://codereview.chromium.org/1751006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45278 0039d316-1c4b-4281-b951-d872f2087c98
* Review URL: http://codereview.chromium.org/1736003amarinichev@chromium.org2010-04-2119-1098/+1624
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45262 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-02-07 04:51:15 +0000