diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 02:30:48 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-21 02:30:48 +0000 |
| commit | 87b76ac6325a46826d67dca20c351154ad3d94a8 (patch) | |
| tree | 0337d73c98fff54ec89946bd9f786979daa58552 /o3d/samples/o3d-webgl/raw_data.js | |
| parent | 130e036f019117d3341c2a15d06e5004e32c9501 (diff) | |
| download | chromium_src-87b76ac6325a46826d67dca20c351154ad3d94a8.zip chromium_src-87b76ac6325a46826d67dca20c351154ad3d94a8.tar.gz chromium_src-87b76ac6325a46826d67dca20c351154ad3d94a8.tar.bz2 | |
Incremental progress toward archive loading in o3d-webgl. Implemented
ArchiveRequest, which expects to be pointed to the top-level scene.json,
and which emulates the behavior of the O3D plugin by downloading the
referenced resources and creating RawData objects for each. Pulled in
public domain JSON parser from http://www.json.org/ . Implemented portions
of TextureCUBE. Fixed some unimplemented functionality and a few bugs
related to creation of parameters. At this point a larger refactoring of
o3d-webgl is needed to make the deserialization work properly, so this code
is being checked in as a checkpoint.
Also fixed small bug in the cg_to_glsl converter script.
BUG=none
TEST=none
TBR=petersont,amarinichev
Review URL: http://codereview.chromium.org/1745002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45143 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/samples/o3d-webgl/raw_data.js')
| -rw-r--r-- | o3d/samples/o3d-webgl/raw_data.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/o3d/samples/o3d-webgl/raw_data.js b/o3d/samples/o3d-webgl/raw_data.js index 59a441c..80a3489f 100644 --- a/o3d/samples/o3d-webgl/raw_data.js +++ b/o3d/samples/o3d-webgl/raw_data.js @@ -55,7 +55,7 @@ o3d.inherit('RawData', 'NamedObject'); * and the uri must end in .json, .txt, .xml, .ini or .csv * @type {string} */ -o3d.RawData.prototype.string_value = ''; +o3d.RawData.prototype.stringValue = ''; /** |