Add RawData request in preparation for manual loading of...

core/cross/file_request.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.
@@ skipping 24 matching lines @@
 #ifndef O3D_CORE_CROSS_FILE_REQUEST_H_
 #define O3D_CORE_CROSS_FILE_REQUEST_H_
 
 #include <algorithm>
 #include <string>
 
 #include "base/scoped_ptr.h"
 #include "core/cross/callback.h"
 #include "core/cross/object_base.h"
 #include "core/cross/pack.h"
+#include "import/cross/raw_data.h"
 
 namespace o3d {
 
 typedef Closure FileRequestCallback;
 
 // A FileRequest object is used to carry out an asynchronous request for a file
 // to be loaded.
 class FileRequest : public ObjectBase {
  public:
   enum Type {
     TYPE_INVALID,
     TYPE_TEXTURE,
-    TYPE_MAX = TYPE_TEXTURE,
+    TYPE_RAWDATA,
+    TYPE_MAX = TYPE_RAWDATA,
   };
 
   enum ReadyState {  // These are copied from XMLHttpRequest.
     STATE_INIT = 0,
     STATE_OPEN = 1,
     STATE_SENT = 2,
     STATE_RECEIVING = 3,
     STATE_LOADED = 4,
   };
 
  public:
   typedef SmartPointer<FileRequest> Ref;
 
   virtual ~FileRequest() { }
 
   static FileRequest *Create(ServiceLocator* service_locator,
                              Pack *pack,
                              Type type);
 
   static Type TypeFromString(String type) {
     std::transform(type.begin(),
                    type.end(),
                    type.begin(),
         ::tolower);
     if (type == "texture") {
       return TYPE_TEXTURE;
     }
+    if (type == "rawdata") {
+      return TYPE_RAWDATA;
+    }
     return TYPE_INVALID;
   }
 
   static bool IsValidType(Type type) {
     return type > TYPE_INVALID && type <= TYPE_MAX;
   }
   Pack *pack() const {
     return pack_.Get();  // Set at creation time and never changed.
   }
   FileRequestCallback *onreadystatechange() const {
     return onreadystatechange_.get();
   }
   void set_onreadystatechange(FileRequestCallback *onreadystatechange) {
     onreadystatechange_.reset(onreadystatechange);
   }
   const String& uri() const {
     return uri_;
   }
   void set_uri(const String& uri) {
     uri_ = uri;
   }
   Type type() const {
     return type_;  // Set at creation time and never changed.
   }
   Texture *texture() const {
     return texture_.Get();
   }
+  RawData *data() const {
+    return data_.Get();
+  }
   bool generate_mipmaps() const { return generate_mipmaps_; }
   void set_generate_mipmaps(bool value) {
     generate_mipmaps_ = value;
   }
   void set_texture(Texture *texture) {
     CHECK(type_ == TYPE_TEXTURE);
     texture_ = Texture::Ref(texture);
   }
+  void set_data(RawData *data) {
+    CHECK(type_ == TYPE_RAWDATA);
+    data_ = RawData::Ref(data);
+  }
   bool done() const {
     return done_;
   }
   bool success() const {
     return success_;
   }
   void set_success(bool success) {
     success_ = success;
     done_ = true;
     pack_.Reset();  // Removes pack reference, allowing pack garbage collection.
@@ skipping 16 matching lines @@
  private:
   FileRequest(ServiceLocator* service_locator,
               Pack *pack,
               Type type);
 
   Pack::Ref pack_;
   scoped_ptr<FileRequestCallback> onreadystatechange_;
   String uri_;
   Type type_;
   Texture::Ref texture_;  // Only used on a successful texture load.
+  RawData::Ref data_;  // Only used on a successful RawData load.
   bool generate_mipmaps_;
   bool done_;  // Set after completion/failure to indicate success_ is valid.
   bool success_;  // Set after completion/failure to indicate which it is.
   int ready_state_;  // Like the XMLHttpRequest variable of the same name.
   String error_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(FileRequest);
 };  // FileRequest
 
 }  // namespace o3d
 
 #endif  // O3D_CORE_CROSS_FILE_REQUEST_H_