diff options
| author | petersont@google.com <petersont@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 23:03:47 +0000 |
|---|---|---|
| committer | petersont@google.com <petersont@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-22 23:03:47 +0000 |
| commit | e05040ff4032c43e6feb09c5810d84a149464b8e (patch) | |
| tree | 5698e53fd4a5b9791026b3b6b0143e54e839950c /o3d/samples/o3d-webgl/bounding_box.js | |
| parent | 2e39f625a1e09e2a1b29bb90e3a4aa1fee5829b1 (diff) | |
| download | chromium_src-e05040ff4032c43e6feb09c5810d84a149464b8e.zip chromium_src-e05040ff4032c43e6feb09c5810d84a149464b8e.tar.gz chromium_src-e05040ff4032c43e6feb09c5810d84a149464b8e.tar.bz2 | |
Implemented Texture2D.drawImage, along the way cleaned up a number of lingering bugs, moved some texture initialization so subsequent calls to gl.texSubImage2D wouldn't fail.
Review URL: http://codereview.chromium.org/1092003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42277 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/o3d-webgl/bounding_box.js')
| -rw-r--r-- | o3d/samples/o3d-webgl/bounding_box.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/o3d/samples/o3d-webgl/bounding_box.js b/o3d/samples/o3d-webgl/bounding_box.js index 506dd2c..ec92270 100644 --- a/o3d/samples/o3d-webgl/bounding_box.js +++ b/o3d/samples/o3d-webgl/bounding_box.js @@ -72,7 +72,7 @@ o3d.BoundingBox.prototype.maxExtent = [0, 0, 0]; * Multiplies the bounding box by the given matrix returning a new bounding * box. * @param {!o3d.math.Matrix4} matrix The matrix to multiply by. - * @returns {!o3d.BoundingBox} The new bounding box. + * @return {!o3d.BoundingBox} The new bounding box. */ o3d.BoundingBox.prototype.mul = function(matrix) { @@ -84,7 +84,7 @@ o3d.BoundingBox.prototype.mul = * Adds a bounding box to this bounding box returning a bounding box that * encompases both. * @param {!o3d.BoundingBox} box BoundingBox to add to this BoundingBox. - * @returns {!o3d.BoundingBox} The new bounding box. + * @return {!o3d.BoundingBox} The new bounding box. */ o3d.BoundingBox.prototype.add = function(box) { @@ -98,7 +98,7 @@ o3d.BoundingBox.prototype.add = * TODO(petersont): this can also take six coordinates as input. * @param {!o3d.math.Point3} start position of start of ray in local space. * @param {!o3d.math.Point3} end position of end of ray in local space. - * @returns {!o3d.RayIntersectionInfo} RayIntersectionInfo. If result.value + * @return {!o3d.RayIntersectionInfo} RayIntersectionInfo. If result.value * is false then something was wrong like using this function with an * uninitialized bounding box. If result.intersected is true then the ray * intersected the box and result.position is the exact point of @@ -114,7 +114,7 @@ o3d.BoundingBox.prototype.intersectRay = * Returns true if the bounding box is inside the frustum. * @param {!o3d.math.Matrix4} matrix Matrix to transform the box from its * local space to view frustum space. - * @returns {boolean} True if the box is in the frustum. + * @return {boolean} True if the box is in the frustum. */ o3d.BoundingBox.prototype.inFrustum = function(matrix) { |