Made all line endings consistently LF and added svn:eol-style=LF property to files with these names / extensions.

c
cc
h
mm
txt
idl
py
js
html
css
gyp
gypi
xml
shader
json
htm
README
DEPS


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31811 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 593 insertions, 593 deletions

diff --git a/o3d/import/cross/camera_info.h b/o3d/import/cross/camera_info.h
index a221fbb..94c88a6 100644
--- a/o3d/import/cross/camera_info.h
+++ b/o3d/import/cross/camera_info.h
@@ -1,221 +1,221 @@
-/*

- * Copyright 2009, Google Inc.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are

- * met:

- *

- *     * Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above

- * copyright notice, this list of conditions and the following disclaimer

- * in the documentation and/or other materials provided with the

- * distribution.

- *     * Neither the name of Google Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from

- * this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-

-// This file declares the CameraInfo class.

-

-#ifndef O3D_IMPORT_CROSS_CAMERA_INFO_H_

-#define O3D_IMPORT_CROSS_CAMERA_INFO_H_

-

-#include "import/cross/json_object.h"

-

-namespace o3d {

-

-// CameraInfo is a used for serialization only and is not part of the

-// normal O3D plugin. It is used for information about the camera.

-class CameraInfo : public JSONObject {

- public:

-  typedef SmartPointer<CameraInfo> Ref;

-

-  static const char* kAspectRatioParamName;

-  static const char* kNearZParamName;

-  static const char* kFarZParamName;

-  static const char* kTransformValueName;

-  static const char* kEyeValueName;

-  static const char* kTargetValueName;

-  static const char* kUpValueName;

-

-  // Gets the near_z.

-  float near_z() const {

-    return near_z_param_->value();

-  }

-

-  // Sets the near_z.

-  void set_near_z(float value) {

-    near_z_param_->set_value(value);

-  }

-

-  // Gets the far_z.

-  float far_z() const {

-    return far_z_param_->value();

-  }

-

-  // Sets the far_z.

-  void set_far_z(float value) {

-    far_z_param_->set_value(value);

-  }

-

-  // Gets the aspect_ratio.

-  float aspect_ratio() const {

-    return aspect_ratio_param_->value();

-  }

-

-  // Sets the aspect_ratio.

-  void set_aspect_ratio(float value) {

-    aspect_ratio_param_->set_value(value);

-  }

-

-  // Gets the transform.

-  Transform* transform() const {

-    return transform_value_->value();

-  }

-

-  // Sets the transform.

-  void set_transform(Transform* value) {

-    transform_value_->set_value(value);

-  }

-

-  // Gets the eye.

-  Float3 eye() const {

-    return eye_value_->value();

-  }

-

-  // Sets the eye.

-  void set_eye(const Float3& value) {

-    eye_value_->set_value(value);

-  }

-

-  // Gets the target.

-  Float3 target() const {

-    return target_value_->value();

-  }

-

-  // Sets the target.

-  void set_target(const Float3& value) {

-    target_value_->set_value(value);

-  }

-

-  // Gets the up.

-  Float3 up() const {

-    return up_value_->value();

-  }

-

-  // Sets the up.

-  void set_up(const Float3& value) {

-    up_value_->set_value(value);

-  }

-

- protected:

-  explicit CameraInfo(ServiceLocator* service_locator);

-

- private:

-  // We make these params so we can easily attach animation to the camera's

-  // parameters.

-  ParamFloat::Ref aspect_ratio_param_;

-  ParamFloat::Ref near_z_param_;

-  ParamFloat::Ref far_z_param_;

-

-  // These are not params, just JSON values.

-  JSONTransform::Ref transform_value_;

-  JSONOptionalFloat3::Ref eye_value_;

-  JSONOptionalFloat3::Ref target_value_;

-  JSONOptionalFloat3::Ref up_value_;

-

-  O3D_OBJECT_BASE_DECL_CLASS(CameraInfo, JSONObject);

-  DISALLOW_COPY_AND_ASSIGN(CameraInfo);

-};

-

-class OrthographicCameraInfo : public CameraInfo {

- public:

-  typedef SmartPointer<OrthographicCameraInfo> Ref;

-

-  static const char* kMagXParamName;

-  static const char* kMagYParamName;

-

-  // Gets the mag_x.

-  float mag_x() const {

-    return mag_x_param_->value();

-  }

-

-  // Sets the mag_x.

-  void set_mag_x(float value) {

-    mag_x_param_->set_value(value);

-  }

-

-  // Gets the mag_y.

-  float mag_y() const {

-    return mag_y_param_->value();

-  }

-

-  // Sets the mag_y.

-  void set_mag_y(float value) {

-    mag_y_param_->set_value(value);

-  }

-

- private:

-  explicit OrthographicCameraInfo(ServiceLocator* service_locator);

-

-  friend class IClassManager;

-  static ObjectBase::Ref Create(ServiceLocator* service_locator);

-

-  // We make these params so we can easily attach animation to the camera's

-  // parameters.

-  ParamFloat::Ref mag_x_param_;

-  ParamFloat::Ref mag_y_param_;

-

-  O3D_OBJECT_BASE_DECL_CLASS(OrthographicCameraInfo, CameraInfo);

-  DISALLOW_COPY_AND_ASSIGN(OrthographicCameraInfo);

-};

-

-class PerspectiveCameraInfo : public CameraInfo {

- public:

-  typedef SmartPointer<PerspectiveCameraInfo> Ref;

-

-  static const char* kFieldOfViewYParamName;

-

-  // Gets the field_of_view_y.

-  float field_of_view_y() const {

-    return field_of_view_y_param_->value();

-  }

-

-  // Sets the field_of_view_y.

-  void set_field_of_view_y(float value) {

-    field_of_view_y_param_->set_value(value);

-  }

-

- private:

-  explicit PerspectiveCameraInfo(ServiceLocator* service_locator);

-

-  friend class IClassManager;

-  static ObjectBase::Ref Create(ServiceLocator* service_locator);

-

-  // We make these params so we can easily attach animation to the camera's

-  // parameters.

-  ParamFloat::Ref field_of_view_y_param_;

-

-  O3D_OBJECT_BASE_DECL_CLASS(PerspectiveCameraInfo, CameraInfo);

-  DISALLOW_COPY_AND_ASSIGN(PerspectiveCameraInfo);

-};

-

-}  // namespace o3d

-

-#endif  // O3D_IMPORT_CROSS_CAMERA_INFO_H_

-

+/*
+ * Copyright 2009, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+// This file declares the CameraInfo class.
+
+#ifndef O3D_IMPORT_CROSS_CAMERA_INFO_H_
+#define O3D_IMPORT_CROSS_CAMERA_INFO_H_
+
+#include "import/cross/json_object.h"
+
+namespace o3d {
+
+// CameraInfo is a used for serialization only and is not part of the
+// normal O3D plugin. It is used for information about the camera.
+class CameraInfo : public JSONObject {
+ public:
+  typedef SmartPointer<CameraInfo> Ref;
+
+  static const char* kAspectRatioParamName;
+  static const char* kNearZParamName;
+  static const char* kFarZParamName;
+  static const char* kTransformValueName;
+  static const char* kEyeValueName;
+  static const char* kTargetValueName;
+  static const char* kUpValueName;
+
+  // Gets the near_z.
+  float near_z() const {
+    return near_z_param_->value();
+  }
+
+  // Sets the near_z.
+  void set_near_z(float value) {
+    near_z_param_->set_value(value);
+  }
+
+  // Gets the far_z.
+  float far_z() const {
+    return far_z_param_->value();
+  }
+
+  // Sets the far_z.
+  void set_far_z(float value) {
+    far_z_param_->set_value(value);
+  }
+
+  // Gets the aspect_ratio.
+  float aspect_ratio() const {
+    return aspect_ratio_param_->value();
+  }
+
+  // Sets the aspect_ratio.
+  void set_aspect_ratio(float value) {
+    aspect_ratio_param_->set_value(value);
+  }
+
+  // Gets the transform.
+  Transform* transform() const {
+    return transform_value_->value();
+  }
+
+  // Sets the transform.
+  void set_transform(Transform* value) {
+    transform_value_->set_value(value);
+  }
+
+  // Gets the eye.
+  Float3 eye() const {
+    return eye_value_->value();
+  }
+
+  // Sets the eye.
+  void set_eye(const Float3& value) {
+    eye_value_->set_value(value);
+  }
+
+  // Gets the target.
+  Float3 target() const {
+    return target_value_->value();
+  }
+
+  // Sets the target.
+  void set_target(const Float3& value) {
+    target_value_->set_value(value);
+  }
+
+  // Gets the up.
+  Float3 up() const {
+    return up_value_->value();
+  }
+
+  // Sets the up.
+  void set_up(const Float3& value) {
+    up_value_->set_value(value);
+  }
+
+ protected:
+  explicit CameraInfo(ServiceLocator* service_locator);
+
+ private:
+  // We make these params so we can easily attach animation to the camera's
+  // parameters.
+  ParamFloat::Ref aspect_ratio_param_;
+  ParamFloat::Ref near_z_param_;
+  ParamFloat::Ref far_z_param_;
+
+  // These are not params, just JSON values.
+  JSONTransform::Ref transform_value_;
+  JSONOptionalFloat3::Ref eye_value_;
+  JSONOptionalFloat3::Ref target_value_;
+  JSONOptionalFloat3::Ref up_value_;
+
+  O3D_OBJECT_BASE_DECL_CLASS(CameraInfo, JSONObject);
+  DISALLOW_COPY_AND_ASSIGN(CameraInfo);
+};
+
+class OrthographicCameraInfo : public CameraInfo {
+ public:
+  typedef SmartPointer<OrthographicCameraInfo> Ref;
+
+  static const char* kMagXParamName;
+  static const char* kMagYParamName;
+
+  // Gets the mag_x.
+  float mag_x() const {
+    return mag_x_param_->value();
+  }
+
+  // Sets the mag_x.
+  void set_mag_x(float value) {
+    mag_x_param_->set_value(value);
+  }
+
+  // Gets the mag_y.
+  float mag_y() const {
+    return mag_y_param_->value();
+  }
+
+  // Sets the mag_y.
+  void set_mag_y(float value) {
+    mag_y_param_->set_value(value);
+  }
+
+ private:
+  explicit OrthographicCameraInfo(ServiceLocator* service_locator);
+
+  friend class IClassManager;
+  static ObjectBase::Ref Create(ServiceLocator* service_locator);
+
+  // We make these params so we can easily attach animation to the camera's
+  // parameters.
+  ParamFloat::Ref mag_x_param_;
+  ParamFloat::Ref mag_y_param_;
+
+  O3D_OBJECT_BASE_DECL_CLASS(OrthographicCameraInfo, CameraInfo);
+  DISALLOW_COPY_AND_ASSIGN(OrthographicCameraInfo);
+};
+
+class PerspectiveCameraInfo : public CameraInfo {
+ public:
+  typedef SmartPointer<PerspectiveCameraInfo> Ref;
+
+  static const char* kFieldOfViewYParamName;
+
+  // Gets the field_of_view_y.
+  float field_of_view_y() const {
+    return field_of_view_y_param_->value();
+  }
+
+  // Sets the field_of_view_y.
+  void set_field_of_view_y(float value) {
+    field_of_view_y_param_->set_value(value);
+  }
+
+ private:
+  explicit PerspectiveCameraInfo(ServiceLocator* service_locator);
+
+  friend class IClassManager;
+  static ObjectBase::Ref Create(ServiceLocator* service_locator);
+
+  // We make these params so we can easily attach animation to the camera's
+  // parameters.
+  ParamFloat::Ref field_of_view_y_param_;
+
+  O3D_OBJECT_BASE_DECL_CLASS(PerspectiveCameraInfo, CameraInfo);
+  DISALLOW_COPY_AND_ASSIGN(PerspectiveCameraInfo);
+};
+
+}  // namespace o3d
+
+#endif  // O3D_IMPORT_CROSS_CAMERA_INFO_H_
+
diff --git a/o3d/import/cross/destination_buffer.h b/o3d/import/cross/destination_buffer.h
index 5b12e34..8b4b5d2 100644
--- a/o3d/import/cross/destination_buffer.h
+++ b/o3d/import/cross/destination_buffer.h
@@ -1,83 +1,83 @@
-/*

- * Copyright 2009, Google Inc.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are

- * met:

- *

- *     * Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above

- * copyright notice, this list of conditions and the following disclaimer

- * in the documentation and/or other materials provided with the

- * distribution.

- *     * Neither the name of Google Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from

- * this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-

-// This file declares the DestinationBuffer class.

-

-#ifndef O3D_IMPORT_CROSS_DESTINATION_BUFFER_H_

-#define O3D_IMPORT_CROSS_DESTINATION_BUFFER_H_

-

-#include "core/cross/buffer.h"

-

-namespace o3d {

-

-// DestinationBuffer is a used for serialization only and is not part of the

-// normal O3D plugin. It is used for Skinning to distinguish between a normal

-// VertexBuffer that needs to have its contents serialized and a

-// DestinationBuffer that only needs to know its structure but not its

-// contents.

-class DestinationBuffer : public VertexBuffer {

- public:

-  typedef SmartPointer<DestinationBuffer> Ref;

-

-  ~DestinationBuffer();

-

- protected:

-  // Overridden from Buffer.

-  virtual bool ConcreteAllocate(size_t size_in_bytes);

-

-  // Overridden from Buffer.

-  virtual bool ConcreteLock(AccessMode access_mode, void **buffer_data);

-

-  // Overridden from Buffer.

-  virtual bool ConcreteUnlock();

-

-  explicit DestinationBuffer(ServiceLocator* service_locator);

-

- protected:

-  // Frees the buffer if it exists.

-  void ConcreteFree();

-

- private:

-  friend class IClassManager;

-  static ObjectBase::Ref Create(ServiceLocator* service_locator);

-

-  scoped_array<char> buffer_;  // The actual data for this buffer.

-

-  O3D_OBJECT_BASE_DECL_CLASS(DestinationBuffer, VertexBuffer);

-  DISALLOW_COPY_AND_ASSIGN(DestinationBuffer);

-};

-

-

-}  // namespace o3d

-

-#endif  // O3D_IMPORT_CROSS_DESTINATION_BUFFER_H_

-

+/*
+ * Copyright 2009, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+
+// This file declares the DestinationBuffer class.
+
+#ifndef O3D_IMPORT_CROSS_DESTINATION_BUFFER_H_
+#define O3D_IMPORT_CROSS_DESTINATION_BUFFER_H_
+
+#include "core/cross/buffer.h"
+
+namespace o3d {
+
+// DestinationBuffer is a used for serialization only and is not part of the
+// normal O3D plugin. It is used for Skinning to distinguish between a normal
+// VertexBuffer that needs to have its contents serialized and a
+// DestinationBuffer that only needs to know its structure but not its
+// contents.
+class DestinationBuffer : public VertexBuffer {
+ public:
+  typedef SmartPointer<DestinationBuffer> Ref;
+
+  ~DestinationBuffer();
+
+ protected:
+  // Overridden from Buffer.
+  virtual bool ConcreteAllocate(size_t size_in_bytes);
+
+  // Overridden from Buffer.
+  virtual bool ConcreteLock(AccessMode access_mode, void **buffer_data);
+
+  // Overridden from Buffer.
+  virtual bool ConcreteUnlock();
+
+  explicit DestinationBuffer(ServiceLocator* service_locator);
+
+ protected:
+  // Frees the buffer if it exists.
+  void ConcreteFree();
+
+ private:
+  friend class IClassManager;
+  static ObjectBase::Ref Create(ServiceLocator* service_locator);
+
+  scoped_array<char> buffer_;  // The actual data for this buffer.
+
+  O3D_OBJECT_BASE_DECL_CLASS(DestinationBuffer, VertexBuffer);
+  DISALLOW_COPY_AND_ASSIGN(DestinationBuffer);
+};
+
+
+}  // namespace o3d
+
+#endif  // O3D_IMPORT_CROSS_DESTINATION_BUFFER_H_
+
diff --git a/o3d/import/cross/json_object.h b/o3d/import/cross/json_object.h
index 3cf2815..a4c153a 100644
--- a/o3d/import/cross/json_object.h
+++ b/o3d/import/cross/json_object.h
@@ -1,289 +1,289 @@
-/*

- * Copyright 2009, Google Inc.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are

- * met:

- *

- *     * Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- *     * Redistributions in binary form must reproduce the above

- * copyright notice, this list of conditions and the following disclaimer

- * in the documentation and/or other materials provided with the

- * distribution.

- *     * Neither the name of Google Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from

- * this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- */

-

-// This file declares the JSONObject class.

-

-#ifndef O3D_IMPORT_CROSS_JSON_OBJECT_H_

-#define O3D_IMPORT_CROSS_JSON_OBJECT_H_

-

-#include <map>

-#include "core/cross/param_object.h"

-#include "core/cross/material.h"

-#include "core/cross/transform.h"

-#include "serializer/cross/serializer.h"

-

-namespace o3d {

-

-class StructuredWriter;

-

-// A JSONValue is a base class for all JSON values stored in a JSONObject.

-class JSONValue : public RefCounted {

- public:

-  typedef SmartPointer<JSONValue> Ref;

-

-  virtual ~JSONValue() {

-  }

-

-  // Whether or not this value exists.

-  bool exists() const {

-    return exists_;

-  }

-

-  // Sets the existence of this value.

-  void set_exists(bool exists) {

-    exists_ = exists;

-  }

-

-  // Function to serialize the value of this JSON value.

-  virtual void Serialize(StructuredWriter* writer) const = 0;

-

- protected:

-  // optional means the value is optional. If true the value defaults to

-  // not existing. If false the value defaults to existing.

-  explicit JSONValue(bool optional)

-      : optional_(optional), exists_(!optional) {

-  }

-

- private:

-  bool optional_;

-  bool exists_;  // used for optional values.

-};

-

-// A Template for optional typed non-ref JSON values.

-template<class T, bool optional>

-class TypedJSONValue : public JSONValue {

- public:

-  typedef T DataType;

-  TypedJSONValue()

-      : JSONValue(optional) {

-  }

-  virtual ~TypedJSONValue() {}

-

-  // Sets the value stored in the JSONValue.

-  void set_value(const DataType& value) {

-    set_exists(true);

-    value_ = value;

-  }

-

-  // Returns the current value stored in the JSONValue.

-  DataType value() const {

-    DCHECK(exists());

-    return value_;

-  }

-

-  // Overridden from JSONValue.

-  virtual void Serialize(StructuredWriter* writer) const {

-    DCHECK(exists());

-    o3d::Serialize(writer, value());

-  }

-

- private:

-  // The value stored in the JSONValue.

-  DataType value_;

-

-  DISALLOW_COPY_AND_ASSIGN(TypedJSONValue);

-};

-

-// A Template for typed ref JSON values.

-template<typename T>

-class TypedRefJSONValue : public JSONValue {

- public:

-  typedef T* Pointer;

-  typedef T DataType;

-

-  TypedRefJSONValue()

-      : JSONValue(false) {

-  }

-

-  virtual ~TypedRefJSONValue() {

-  }

-

-  // Set the value stored in the.

-  void set_value(Pointer const value) {

-    value_ = typename T::Ref(value);

-  }

-

-  // Returns the current value stored in the Param.

-  Pointer value() const {

-    return value_.Get();

-  }

-

-  // Overridden from JSONValue.

-  virtual void Serialize(StructuredWriter* writer) const {

-    o3d::Serialize(writer, static_cast<ObjectBase*>(value()));

-  }

-

- protected:

-  typename T::Ref value_;

-

- private:

-  DISALLOW_COPY_AND_ASSIGN(TypedRefJSONValue);

-};

-

-// Classes for various types of JSON Data.

-class JSONFloat : public TypedJSONValue<float, false> {

- public:

-  typedef SmartPointer<JSONFloat> Ref;

-  JSONFloat() {

-    set_value(0.0f);

-  }

-};

-class JSONFloat2 : public TypedJSONValue<Float2, false> {

- public:

-  typedef SmartPointer<JSONFloat2> Ref;

-  JSONFloat2() {

-    set_value(Float2(0.0f, 0.0f));

-  }

-};

-class JSONFloat3 : public TypedJSONValue<Float3, false> {

- public:

-  typedef SmartPointer<JSONFloat3> Ref;

-  JSONFloat3() {

-    set_value(Float3(0.0f, 0.0f, 0.0f));

-  }

-};

-class JSONFloat4 : public TypedJSONValue<Float4, false> {

- public:

-  typedef SmartPointer<JSONFloat4> Ref;

-  JSONFloat4() {

-    set_value(Float4(0.0f, 0.0f, 0.0f, 0.0f));

-  }

-};

-class JSONMatrix4 : public TypedJSONValue<Matrix4, false> {

- public:

-  typedef SmartPointer<JSONMatrix4> Ref;

-  JSONMatrix4() {

-    set_value(Matrix4::identity());

-  }

-};

-class JSONInteger : public TypedJSONValue<int, false> {

- public:

-  typedef SmartPointer<JSONInteger> Ref;

-  JSONInteger() {

-    set_value(0);

-  }

-};

-class JSONBoolean : public TypedJSONValue<bool, false> {

- public:

-  typedef SmartPointer<JSONBoolean> Ref;

-  JSONBoolean() {

-    set_value(false);

-  }

-};

-class JSONString : public TypedJSONValue<String, false> {

- public:

-  typedef SmartPointer<JSONString> Ref;

-};

-class JSONTransform : public TypedRefJSONValue<Transform> {

- public:

-  typedef SmartPointer<JSONTransform> Ref;

-};

-class JSONMaterial : public TypedRefJSONValue<Material> {

- public:

-  typedef SmartPointer<JSONMaterial> Ref;

-};

-class JSONOptionalFloat : public TypedJSONValue<float, true> {

- public:

-  typedef SmartPointer<JSONOptionalFloat> Ref;

-};

-class JSONOptionalFloat2 : public TypedJSONValue<Float2, true> {

- public:

-  typedef SmartPointer<JSONOptionalFloat2> Ref;

-};

-class JSONOptionalFloat3 : public TypedJSONValue<Float3, true> {

- public:

-  typedef SmartPointer<JSONOptionalFloat3> Ref;

-};

-class JSONOptionalFloat4 : public TypedJSONValue<Float4, true> {

- public:

-  typedef SmartPointer<JSONOptionalFloat4> Ref;

-};

-class JSONOptionalMatrix4 : public TypedJSONValue<Matrix4, true> {

- public:

-  typedef SmartPointer<JSONOptionalMatrix4> Ref;

-};

-class JSONOptionalInteger : public TypedJSONValue<int, true> {

- public:

-  typedef SmartPointer<JSONOptionalInteger> Ref;

-};

-class JSONOptionalBoolean : public TypedJSONValue<bool, true> {

- public:

-  typedef SmartPointer<JSONOptionalBoolean> Ref;

-};

-class JSONOptionalString : public TypedJSONValue<String, true> {

- public:

-  typedef SmartPointer<JSONOptionalString> Ref;

-};

-

-// A JSONObject is a used for serialization only and is not part of the normal

-// O3D plugin. It is used to easily add name/value pairs to be serialized by the

-// serializer as JSON objects.  Being that it's ParamObject you have 2 choices

-// for getting data serialized. As O3D Params or as JSONValues. The reason to

-// use one over the other... Params can be animated but are relatively heavy.

-// JSONValues become plane JavaScript when deserialized.

-// To add a Param use RegisterParamRef, to add a JSONValue use

-// RegisterJSONValue.

-class JSONObject : public ParamObject {

- public:

-  typedef SmartPointer<JSONObject> Ref;

-  typedef std::map<String, JSONValue::Ref> NameValueMap;

-

-  // Seralizes the JSONObject.

-  void Serialize(StructuredWriter* writer) const;

-

- protected:

-  explicit JSONObject(ServiceLocator* service_locator);

-

-  // Registers a pointer to a reference to a JSONValue.

-  // Parameters:

-  //   name: name of JSONValue

-  //   ref_pointer: Pointer to typed reference to JSONValue.

-  template<typename T>

-  void RegisterJSONValue(const String& name, T* ref_pointer) {

-    *ref_pointer = T(new typename T::ClassType());

-    AddProperty(name, ref_pointer->Get());

-  }

-

- private:

-  // Adds a property to this JSON Object.

-  void AddProperty(const String& name, JSONValue* value);

-

-  NameValueMap properties_;

-

-  O3D_OBJECT_BASE_DECL_CLASS(JSONObject, ParamObject);

-  DISALLOW_COPY_AND_ASSIGN(JSONObject);

-};

-

-}  // namespace o3d

-

-#endif  // O3D_IMPORT_CROSS_JSON_OBJECT_H_

-

-

+/*
+ * Copyright 2009, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+// This file declares the JSONObject class.
+
+#ifndef O3D_IMPORT_CROSS_JSON_OBJECT_H_
+#define O3D_IMPORT_CROSS_JSON_OBJECT_H_
+
+#include <map>
+#include "core/cross/param_object.h"
+#include "core/cross/material.h"
+#include "core/cross/transform.h"
+#include "serializer/cross/serializer.h"
+
+namespace o3d {
+
+class StructuredWriter;
+
+// A JSONValue is a base class for all JSON values stored in a JSONObject.
+class JSONValue : public RefCounted {
+ public:
+  typedef SmartPointer<JSONValue> Ref;
+
+  virtual ~JSONValue() {
+  }
+
+  // Whether or not this value exists.
+  bool exists() const {
+    return exists_;
+  }
+
+  // Sets the existence of this value.
+  void set_exists(bool exists) {
+    exists_ = exists;
+  }
+
+  // Function to serialize the value of this JSON value.
+  virtual void Serialize(StructuredWriter* writer) const = 0;
+
+ protected:
+  // optional means the value is optional. If true the value defaults to
+  // not existing. If false the value defaults to existing.
+  explicit JSONValue(bool optional)
+      : optional_(optional), exists_(!optional) {
+  }
+
+ private:
+  bool optional_;
+  bool exists_;  // used for optional values.
+};
+
+// A Template for optional typed non-ref JSON values.
+template<class T, bool optional>
+class TypedJSONValue : public JSONValue {
+ public:
+  typedef T DataType;
+  TypedJSONValue()
+      : JSONValue(optional) {
+  }
+  virtual ~TypedJSONValue() {}
+
+  // Sets the value stored in the JSONValue.
+  void set_value(const DataType& value) {
+    set_exists(true);
+    value_ = value;
+  }
+
+  // Returns the current value stored in the JSONValue.
+  DataType value() const {
+    DCHECK(exists());
+    return value_;
+  }
+
+  // Overridden from JSONValue.
+  virtual void Serialize(StructuredWriter* writer) const {
+    DCHECK(exists());
+    o3d::Serialize(writer, value());
+  }
+
+ private:
+  // The value stored in the JSONValue.
+  DataType value_;
+
+  DISALLOW_COPY_AND_ASSIGN(TypedJSONValue);
+};
+
+// A Template for typed ref JSON values.
+template<typename T>
+class TypedRefJSONValue : public JSONValue {
+ public:
+  typedef T* Pointer;
+  typedef T DataType;
+
+  TypedRefJSONValue()
+      : JSONValue(false) {
+  }
+
+  virtual ~TypedRefJSONValue() {
+  }
+
+  // Set the value stored in the.
+  void set_value(Pointer const value) {
+    value_ = typename T::Ref(value);
+  }
+
+  // Returns the current value stored in the Param.
+  Pointer value() const {
+    return value_.Get();
+  }
+
+  // Overridden from JSONValue.
+  virtual void Serialize(StructuredWriter* writer) const {
+    o3d::Serialize(writer, static_cast<ObjectBase*>(value()));
+  }
+
+ protected:
+  typename T::Ref value_;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(TypedRefJSONValue);
+};
+
+// Classes for various types of JSON Data.
+class JSONFloat : public TypedJSONValue<float, false> {
+ public:
+  typedef SmartPointer<JSONFloat> Ref;
+  JSONFloat() {
+    set_value(0.0f);
+  }
+};
+class JSONFloat2 : public TypedJSONValue<Float2, false> {
+ public:
+  typedef SmartPointer<JSONFloat2> Ref;
+  JSONFloat2() {
+    set_value(Float2(0.0f, 0.0f));
+  }
+};
+class JSONFloat3 : public TypedJSONValue<Float3, false> {
+ public:
+  typedef SmartPointer<JSONFloat3> Ref;
+  JSONFloat3() {
+    set_value(Float3(0.0f, 0.0f, 0.0f));
+  }
+};
+class JSONFloat4 : public TypedJSONValue<Float4, false> {
+ public:
+  typedef SmartPointer<JSONFloat4> Ref;
+  JSONFloat4() {
+    set_value(Float4(0.0f, 0.0f, 0.0f, 0.0f));
+  }
+};
+class JSONMatrix4 : public TypedJSONValue<Matrix4, false> {
+ public:
+  typedef SmartPointer<JSONMatrix4> Ref;
+  JSONMatrix4() {
+    set_value(Matrix4::identity());
+  }
+};
+class JSONInteger : public TypedJSONValue<int, false> {
+ public:
+  typedef SmartPointer<JSONInteger> Ref;
+  JSONInteger() {
+    set_value(0);
+  }
+};
+class JSONBoolean : public TypedJSONValue<bool, false> {
+ public:
+  typedef SmartPointer<JSONBoolean> Ref;
+  JSONBoolean() {
+    set_value(false);
+  }
+};
+class JSONString : public TypedJSONValue<String, false> {
+ public:
+  typedef SmartPointer<JSONString> Ref;
+};
+class JSONTransform : public TypedRefJSONValue<Transform> {
+ public:
+  typedef SmartPointer<JSONTransform> Ref;
+};
+class JSONMaterial : public TypedRefJSONValue<Material> {
+ public:
+  typedef SmartPointer<JSONMaterial> Ref;
+};
+class JSONOptionalFloat : public TypedJSONValue<float, true> {
+ public:
+  typedef SmartPointer<JSONOptionalFloat> Ref;
+};
+class JSONOptionalFloat2 : public TypedJSONValue<Float2, true> {
+ public:
+  typedef SmartPointer<JSONOptionalFloat2> Ref;
+};
+class JSONOptionalFloat3 : public TypedJSONValue<Float3, true> {
+ public:
+  typedef SmartPointer<JSONOptionalFloat3> Ref;
+};
+class JSONOptionalFloat4 : public TypedJSONValue<Float4, true> {
+ public:
+  typedef SmartPointer<JSONOptionalFloat4> Ref;
+};
+class JSONOptionalMatrix4 : public TypedJSONValue<Matrix4, true> {
+ public:
+  typedef SmartPointer<JSONOptionalMatrix4> Ref;
+};
+class JSONOptionalInteger : public TypedJSONValue<int, true> {
+ public:
+  typedef SmartPointer<JSONOptionalInteger> Ref;
+};
+class JSONOptionalBoolean : public TypedJSONValue<bool, true> {
+ public:
+  typedef SmartPointer<JSONOptionalBoolean> Ref;
+};
+class JSONOptionalString : public TypedJSONValue<String, true> {
+ public:
+  typedef SmartPointer<JSONOptionalString> Ref;
+};
+
+// A JSONObject is a used for serialization only and is not part of the normal
+// O3D plugin. It is used to easily add name/value pairs to be serialized by the
+// serializer as JSON objects.  Being that it's ParamObject you have 2 choices
+// for getting data serialized. As O3D Params or as JSONValues. The reason to
+// use one over the other... Params can be animated but are relatively heavy.
+// JSONValues become plane JavaScript when deserialized.
+// To add a Param use RegisterParamRef, to add a JSONValue use
+// RegisterJSONValue.
+class JSONObject : public ParamObject {
+ public:
+  typedef SmartPointer<JSONObject> Ref;
+  typedef std::map<String, JSONValue::Ref> NameValueMap;
+
+  // Seralizes the JSONObject.
+  void Serialize(StructuredWriter* writer) const;
+
+ protected:
+  explicit JSONObject(ServiceLocator* service_locator);
+
+  // Registers a pointer to a reference to a JSONValue.
+  // Parameters:
+  //   name: name of JSONValue
+  //   ref_pointer: Pointer to typed reference to JSONValue.
+  template<typename T>
+  void RegisterJSONValue(const String& name, T* ref_pointer) {
+    *ref_pointer = T(new typename T::ClassType());
+    AddProperty(name, ref_pointer->Get());
+  }
+
+ private:
+  // Adds a property to this JSON Object.
+  void AddProperty(const String& name, JSONValue* value);
+
+  NameValueMap properties_;
+
+  O3D_OBJECT_BASE_DECL_CLASS(JSONObject, ParamObject);
+  DISALLOW_COPY_AND_ASSIGN(JSONObject);
+};
+
+}  // namespace o3d
+
+#endif  // O3D_IMPORT_CROSS_JSON_OBJECT_H_
+
+