summaryrefslogtreecommitdiffstats
path: root/o3d
Commit message (Collapse)AuthorAgeFilesLines
* Re-applying patch from http://codereview.chromium.org/606005 .zmo@google.com2010-02-162-4/+33
| | | | | | | | Already reviewed by Vangelis. Review URL: http://codereview.chromium.org/609006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39114 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting files back to known good state. Will re-applyzmo@google.com2010-02-162-244/+113
| | | | | | | | | | http://codereview.chromium.org/606005 afterward. TBR=vangelis Review URL: http://codereview.chromium.org/609005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39113 0039d316-1c4b-4281-b951-d872f2087c98
* Make plugin name and mimetype into overridable GYP variables, so that third ↵tschmelcher@chromium.org2010-02-162-20/+22
| | | | | | | | | | | | | parties can more easily redistribute the O3D NPAPI plugin under a different brand. Analogous change for the ActiveX plugin will be in a forthcoming CL. TEST=built on Linux with various overridden values and checked that about:plugins showed the right thing; trybots BUG=none Review URL: http://codereview.chromium.org/599012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39109 0039d316-1c4b-4281-b951-d872f2087c98
* Fix the software renderer "soft" fullscreen mode using the wrong monitor bug.zmo@google.com2010-02-162-113/+244
| | | | | | Review URL: http://codereview.chromium.org/606005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39107 0039d316-1c4b-4281-b951-d872f2087c98
* Clone of issue 598075. See: http://codereview.chromium.org/598075twiz@google.com2010-02-127-84/+7
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/593083 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38936 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed broken Linux build by changing Counter helper class used bykbr@google.com2010-02-121-21/+21
| | | | | | | | | | NumElements() from a local class to a nested class as Gregg suggested in http://codereview.chromium.org/574024 . Changed this class to use DISALLOW_COPY_AND_ASSIGN. Review URL: http://codereview.chromium.org/606025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38923 0039d316-1c4b-4281-b951-d872f2087c98
* Added an arena allocator and an augmentable red-black tree whichkbr@chromium.org2010-02-127-0/+1449
| | | | | | | | | | | | | allocates its temporary objects from it. In a subsequent checkin, the red-black tree will be augmented into an interval tree, which is a key data structure for efficient implementation of one of the algorithms in the forthcoming code in this directory. I plan to submit this for C++ readability following code review. Review URL: http://codereview.chromium.org/574024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38908 0039d316-1c4b-4281-b951-d872f2087c98
* O3D initialized to the monitor/adapter where the window is on.zmo@google.com2010-02-112-22/+79
| | | | | | Review URL: http://codereview.chromium.org/593031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38819 0039d316-1c4b-4281-b951-d872f2087c98
* Remove redundant casts in g_signal_connect() throughout all gtk code we have.erg@chromium.org2010-02-101-4/+4
| | | | | | | | | BUG=none TEST=none Review URL: http://codereview.chromium.org/600033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38629 0039d316-1c4b-4281-b951-d872f2087c98
* Roll imported Nixysa version forward to get the new universally compatible ↵maf@google.com2010-02-091-1/+1
| | | | | | | | version. Review URL: http://codereview.chromium.org/600024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38528 0039d316-1c4b-4281-b951-d872f2087c98
* Roll back Nixysa imported rev so that we get the Python 2.4 compatible version.maf@google.com2010-02-091-1/+1
| | | | | | Review URL: http://codereview.chromium.org/583016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38522 0039d316-1c4b-4281-b951-d872f2087c98
* Bump DEPS to pull in latest Nixysa.maf@google.com2010-02-081-1/+1
| | | | | | Review URL: http://codereview.chromium.org/582004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38414 0039d316-1c4b-4281-b951-d872f2087c98
* linux: native OpenGL ES supportpiman@google.com2010-02-0814-189/+619
| | | | | | | | | This includes Gregg's CL 548023 There are still a few hard-coded paths, and issues to solve, but hellocube-textures-glsl is running on an actual device. Review URL: http://codereview.chromium.org/572029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38385 0039d316-1c4b-4281-b951-d872f2087c98
* Force Java version to 1.6.0 on Mac OS X because apparently latestkbr@chromium.org2010-02-051-1/+10
| | | | | | | | | JSCompiler binaries require this version. Verified this fix on 10.5 and tested on 10.6 as well. Review URL: http://codereview.chromium.org/578022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38275 0039d316-1c4b-4281-b951-d872f2087c98
* Added needed dependency on npo3dautoplugin because otherwise thekbr@chromium.org2010-02-051-0/+3
| | | | | | | | unpack_firefox target can run before the plugin has been built. Review URL: http://codereview.chromium.org/574019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38272 0039d316-1c4b-4281-b951-d872f2087c98
* Roll Skia to 488 to pick up some new needed entry points.kbr@chromium.org2010-02-051-1/+1
| | | | | | Review URL: http://codereview.chromium.org/577031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38271 0039d316-1c4b-4281-b951-d872f2087c98
* roll deps to pick up nacl changes for armpiman@google.com2010-02-051-1/+1
| | | | | | Review URL: http://codereview.chromium.org/575020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38249 0039d316-1c4b-4281-b951-d872f2087c98
* Worked around bug in 32-bit Safari 4 on Mac OS X 10.6 where thekbr@chromium.org2010-02-051-0/+6
| | | | | | | | | | browser sends O3D a spurious NPP_SetWindow with an invalid window after first sending it a valid one. Tested this on both 10.6 and 10.5; no ill effects on 10.5, including in multiple tab case. Review URL: http://codereview.chromium.org/572027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38236 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed build problem on Mac OS X 10.6. precompile.h is inferred by namekbr@chromium.org2010-02-051-0/+2
| | | | | | | | | | | | to be a C file, but it includes C++ headers like <vector> and <algorithm>. In order for the compiler to find these headers it was necessary to force it to treat this as a C++ header. This fix was determined to be necessary on multiple machines running Xcode 3.2.1. It has also been tested on 10.5 with no ill effects. Review URL: http://codereview.chromium.org/572026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38235 0039d316-1c4b-4281-b951-d872f2087c98
* Bump chromium DEPS to pick up my skia Linux crash fix.tschmelcher@chromium.org2010-02-031-1/+11
| | | | | | | | | TEST=built and ran on Linux and loaded a font that was not installed BUG=none Review URL: http://codereview.chromium.org/565013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38044 0039d316-1c4b-4281-b951-d872f2087c98
* linux: add an option to disable FBO support for platforms that don't have it.piman@google.com2010-02-014-3/+25
| | | | | | Review URL: http://codereview.chromium.org/551218 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37737 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: add missing -D to dpkg-buildpackage command line to enable build ↵tschmelcher@chromium.org2010-02-011-0/+1
| | | | | | | | | | dependency checks. TEST=removed cdbs, built, and verified a build-dep error is reported; trybot Review URL: http://codereview.chromium.org/552244 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37704 0039d316-1c4b-4281-b951-d872f2087c98
* Add Debian/Ubuntu packages back to Linux build.tschmelcher@chromium.org2010-01-2923-220/+245
| | | | | | | | | | | Thanks go to Jeff Bailey for writing most of this CL. Also, bump version to 0.1.43.1 so that it exceeds the version of the previous O3D packages. TEST=build, install, and run on Ubuntu Review URL: http://codereview.chromium.org/556071 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37561 0039d316-1c4b-4281-b951-d872f2087c98
* linux: fixes for the glsl rendererpiman@google.com2010-01-295-10/+11
| | | | | | Review URL: http://codereview.chromium.org/549203 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37552 0039d316-1c4b-4281-b951-d872f2087c98
* Update O3D DEPS to pull in current Nixysa.maf@google.com2010-01-291-1/+1
| | | | | | Review URL: http://codereview.chromium.org/557052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37544 0039d316-1c4b-4281-b951-d872f2087c98
* fix v8 issues by not adding explicit () in eval unless it's necessary.piman@google.com2010-01-291-15/+20
| | | | | | Review URL: http://codereview.chromium.org/557055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37499 0039d316-1c4b-4281-b951-d872f2087c98
* linux: arm fixespiman@google.com2010-01-295-37/+6
| | | | | | Review URL: http://codereview.chromium.org/549104 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37497 0039d316-1c4b-4281-b951-d872f2087c98
* win: fix DXSDK include path, needs to be after platform sdk include pathpiman@google.com2010-01-286-5/+7
| | | | | | Review URL: http://codereview.chromium.org/554110 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37384 0039d316-1c4b-4281-b951-d872f2087c98
* force nacl_standalone=1 for windows - nacl needs itpiman@google.com2010-01-271-0/+3
| | | | | | Review URL: http://codereview.chromium.org/556037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37240 0039d316-1c4b-4281-b951-d872f2087c98
* linux: use internal libjpeg for bots that don't have itpiman@google.com2010-01-271-0/+1
| | | | | | Review URL: http://codereview.chromium.org/549169 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37230 0039d316-1c4b-4281-b951-d872f2087c98
* linux: roll deps for armpiman@google.com2010-01-274-10/+47
| | | | | | Review URL: http://codereview.chromium.org/552063 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37225 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: fix crash in Firefox at plugin unload time when more than one O3D ↵tschmelcher@chromium.org2010-01-203-7/+21
| | | | | | | | | | | | instance is running. The problem here was that Firefox has a bug where closing a tab actually deletes the parent windows of the plugin _before_ calling NPP_Destroy(), and Gtk recursively destroys all children automatically. Hence, once NPP_Destroy() runs our X11 Window handle is already invalid. If there is another O3D instance running in the same browser process, then performing the TearDown() call requires a MakeCurrent() call on the Window handle, which will fail with GLXBadDrawable and kill the browser. The solution requires two things. First, to avoid Gtk recursively destroying the children, we explicitly open a separate X11 connection for our GtkPlug, which means a destroy on the parents does not automatically propagate to the children because it has to go through the X server first. Second, we register a callback with our GtkPlug to handle this event from the X server by turning our GtkPlug into a hidden unparented window rather than destroying it. Unrelatedly, also make fullscreen windows be set_keep_above and fix some spurious unref() calls (which produced warnings but otherwise were mostly harmless). TEST=opening and closing concurrent ping pong windows in FF and Chrome (64-bit) Review URL: http://codereview.chromium.org/553028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36650 0039d316-1c4b-4281-b951-d872f2087c98
* Adds the missing BoundingBox docs. gman@chromium.org2010-01-132-2/+2
| | | | | | | | | | | The issue was we use the marshaled type for classes that define a marsheled function and there are cases, like the boundingbox where we don't want that to happen. Review URL: http://codereview.chromium.org/548001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36071 0039d316-1c4b-4281-b951-d872f2087c98
* Fix docs typo "steam" -> "stream"gman@chromium.org2010-01-081-1/+1
| | | | | | Review URL: http://codereview.chromium.org/538001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35846 0039d316-1c4b-4281-b951-d872f2087c98
* This change removes CG from O3D and uses GLSLgman@chromium.org2010-01-0828-1172/+1938
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of HLSL. The current "hack" for shaders is that the shader string you supply to Effect::LoadFromFXString requires the lines // #o3d SplitMarker \n" Above which is the vertex shader and below which is the fragment shader. Since GLSL has no semantics the names are used for semantics so to get an automatically supplied worldViewProjection you must name the uniform worldViewProjection as in uniform mat4 worldViewProjection Similarly for attributes (vertex streams) you must name them to match O3D semantics as in attribute vec4 texcoord1 attribute vec3 normal etc. Included in this is one working sample in o3d/samples/hellocube-glsl.html Other things: Added a glsl field to clientInfo so that a program can check if it needs to supply GLSL or HLSL. eg client.clientInfo.glsl == true Updated the O3D libraries to store that info in o3djs.base.glsl so that the libaries can be modified to supply GLSL if we want. Note: To run this on windows you must copy glew32.dll and glut32.dll to <AppData>...\Mozilla\plugins To get this to actually work in GLES2 will require (*) renaming a few functions (*) telling O3D there is no NPOT support or if possible no NPOT support unless the texture has only 1 level. (*) removing LargeGeometry and FloatingPointTexture support. (*) Making it link with the GLES2 code Review URL: http://codereview.chromium.org/527028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35845 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: implement setting cursor typetschmelcher@chromium.org2010-01-083-11/+83
| | | | | | Review URL: http://codereview.chromium.org/527024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35764 0039d316-1c4b-4281-b951-d872f2087c98
* Linux: bring back the RPATH setting that was deleted by the GYP transition. ↵tschmelcher@chromium.org2010-01-062-6/+41
| | | | | | | | | | Also, make both it and the envvars path be configurable with GYP_DEFINES, and disable the envvars file by default for the Chrome built-in build (since we don't want an external file at /opt/google/o3d controlling Chrome's behaviour). Also specify --gc-sections for the shared library to reduce size. TEST=built shared library and verified that RPATH is set and envvars parsing is compiled-in; verified library is usable; verified that variables can be overridden; verified that --gc-sections reduces size Review URL: http://codereview.chromium.org/517052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35644 0039d316-1c4b-4281-b951-d872f2087c98
* Fix Terence's namegman@google.com2010-01-061-1/+1
| | | | | | Review URL: http://codereview.chromium.org/515038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35621 0039d316-1c4b-4281-b951-d872f2087c98
* Fixed deadlocks occurring in Chrome during O3D teardown when O3D is inkbr@google.com2009-12-221-1/+13
| | | | | | | | | | | | full-screen mode and another plugin on the page is making an NPAPI call. Deferred O3D's window destruction to work around this issue. Tested O3D and related tests in all browsers; this fixes the deadlock and seems to not introduce any other instability. Review URL: http://codereview.chromium.org/502097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35134 0039d316-1c4b-4281-b951-d872f2087c98
* Rename all GLES2 classes from ___GL to ___GLES2gman@chromium.org2009-12-1723-724/+761
| | | | | | Review URL: http://codereview.chromium.org/500086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34801 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for Windows standalone buildgman@chromium.org2009-12-161-8/+3
| | | | | | | TBR=apatrick@google.com git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34746 0039d316-1c4b-4281-b951-d872f2087c98
* Step 1 in Adding GLES2 renderer to O3D.gman@google.com2009-12-1638-0/+7025
| | | | | | | | | | | | | | | | | | | | | This step does only copies the GL files to a GLES2 folder. It's still actually the GL renderer at this point but it's the smallest step for getting something that builds and a place to start working. The next step will be to rename all the classes from xxxGL to xxxGLES2 At some point CG will be removed as well One other thing slipped in there. A standalone build path to help generate a C++ only example of using O3D. It's currently only a placeholder. Review URL: http://codereview.chromium.org/500070 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34744 0039d316-1c4b-4281-b951-d872f2087c98
* Clean up the rendering of manipulators.simonrad@chromium.org2009-12-121-108/+240
| | | | | | | | | | | | Creates a consistent setup for the shaders. Allows us to use phong or constant shaders or both, and still do highlighting correctly. BUG=none TEST=none Review URL: http://codereview.chromium.org/492026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34416 0039d316-1c4b-4281-b951-d872f2087c98
* New code needs some NULL checks so we don't crash FireFox on 10.6.maf@google.com2009-12-111-5/+9
| | | | | | Review URL: http://codereview.chromium.org/492016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34367 0039d316-1c4b-4281-b951-d872f2087c98
* Refactor the manipulator samples so that the common javascript code is ↵simonrad@chromium.org2009-12-114-756/+312
| | | | | | | | | | | | | | | included from a js file. There is only one function that is specialized for each sample. The function is referenced in the js file but not defined. It is then defined in each html file. R=kbr BUG=none TEST=none Review URL: http://codereview.chromium.org/487019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34312 0039d316-1c4b-4281-b951-d872f2087c98
* Don't screw up the retain count on the original WindowRef referenced by the ↵maf@google.com2009-12-101-0/+11
| | | | | | | | | copy we make of the browser NSWindow. We were accidentally disposing the dummy window in the plugin process that Chrome makes. Review URL: http://codereview.chromium.org/486021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34303 0039d316-1c4b-4281-b951-d872f2087c98
* linux: enabling fontspiman@chromium.org2009-12-102-30/+4
| | | | | | | | 'Cause, guess what, they work now. Review URL: http://codereview.chromium.org/492001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34274 0039d316-1c4b-4281-b951-d872f2087c98
* Fix for O3Djs build break.simonrad@chromium.org2009-12-101-3/+8
| | | | | | | | | | | tbr=kbr BUG=none TEST=none Review URL: http://codereview.chromium.org/487013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34266 0039d316-1c4b-4281-b951-d872f2087c98
* Add line stippling and add functionality to the CameraController.simonrad@chromium.org2009-12-106-172/+406
| | | | | | | | | | | | - Added optional line stippling based on texCoords to the rotate1 line ring shader. - Redesigned the CameraController and added the ability to zoom, dolly, dolly-zoom, and pan using the mouse. BUG=none TEST=none Review URL: http://codereview.chromium.org/486003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34235 0039d316-1c4b-4281-b951-d872f2087c98
* Changes the classlist to be hierarchical.gman@chromium.org2009-12-083-5/+70
| | | | | | Review URL: http://codereview.chromium.org/460097 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@34095 0039d316-1c4b-4281-b951-d872f2087c98
generated by cgit v1.1 at 2025-02-13 12:58:08 +0000