| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright 2009, Google Inc. | 2 * Copyright 2009, Google Inc. |
| 3 * All rights reserved. | 3 * All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 | 38 |
| 39 #include <vector> | 39 #include <vector> |
| 40 #include <set> | 40 #include <set> |
| 41 | 41 |
| 42 #include "core/cross/named_object.h" | 42 #include "core/cross/named_object.h" |
| 43 #include "core/cross/smart_ptr.h" | 43 #include "core/cross/smart_ptr.h" |
| 44 #include "core/cross/transform.h" | 44 #include "core/cross/transform.h" |
| 45 #include "core/cross/types.h" | 45 #include "core/cross/types.h" |
| 46 #include "core/cross/image_utils.h" | 46 #include "core/cross/image_utils.h" |
| 47 #include "core/cross/bitmap.h" | 47 #include "core/cross/bitmap.h" |
| 48 #include "core/cross/cairo/image_2d.h" |
| 48 | 49 |
| 49 class FilePath; | 50 class FilePath; |
| 50 | 51 |
| 51 namespace o3d { | 52 namespace o3d { |
| 52 | 53 |
| 53 class Bitmap; | 54 class Bitmap; |
| 54 class ArchiveRequest; | 55 class ArchiveRequest; |
| 55 class RawData; | 56 class RawData; |
| 56 class Texture; | 57 class Texture; |
| 57 class Texture2D; | 58 class Texture2D; |
| 58 class TextureCUBE; | 59 class TextureCUBE; |
| 59 class FileRequest; | 60 class FileRequest; |
| 60 class DrawContext; | 61 class DrawContext; |
| 61 class IClassManager; | 62 class IClassManager; |
| 62 class ObjectManager; | 63 class ObjectManager; |
| 63 class RenderDepthStencilSurface; | 64 class RenderDepthStencilSurface; |
| 65 class Image2D; |
| 64 | 66 |
| 65 // Type definitions ------------------------ | 67 // Type definitions ------------------------ |
| 66 | 68 |
| 67 // Array of object id's | 69 // Array of object id's |
| 68 typedef std::vector<Id> IdArray; | 70 typedef std::vector<Id> IdArray; |
| 69 // Array of Bitmaps. | 71 // Array of Bitmaps. |
| 70 typedef std::vector<Bitmap*> BitmapArray; | 72 typedef std::vector<Bitmap*> BitmapArray; |
| 71 | 73 |
| 72 // A Pack object functions as a container for O3D objects. All objects | 74 // A Pack object functions as a container for O3D objects. All objects |
| 73 // inheriting from ObjectBase must be constructed and assigned a pack. The Pack | 75 // inheriting from ObjectBase must be constructed and assigned a pack. The Pack |
| (...skipping 375 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 449 O3D_DECL_CLASS(Pack, NamedObject); | 451 O3D_DECL_CLASS(Pack, NamedObject); |
| 450 DISALLOW_COPY_AND_ASSIGN(Pack); | 452 DISALLOW_COPY_AND_ASSIGN(Pack); |
| 451 }; | 453 }; |
| 452 | 454 |
| 453 // Array container for Pack pointers. | 455 // Array container for Pack pointers. |
| 454 typedef std::vector<Pack*> PackArray; | 456 typedef std::vector<Pack*> PackArray; |
| 455 | 457 |
| 456 } // namespace o3d | 458 } // namespace o3d |
| 457 | 459 |
| 458 #endif // O3D_CORE_CROSS_PACK_H_ | 460 #endif // O3D_CORE_CROSS_PACK_H_ |
| OLD | NEW |