| 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 | 189 |
| 190 // Dictionary of Objects indexed by their unique ID | 190 // Dictionary of Objects indexed by their unique ID |
| 191 typedef std::map<Id, ObjectBase*> ObjectMap; | 191 typedef std::map<Id, ObjectBase*> ObjectMap; |
| 192 | 192 |
| 193 ServiceLocator* service_locator_; | 193 ServiceLocator* service_locator_; |
| 194 ServiceImplementation<ObjectManager> service_; | 194 ServiceImplementation<ObjectManager> service_; |
| 195 | 195 |
| 196 // Map of objects to Ids | 196 // Map of objects to Ids |
| 197 ObjectMap object_map_; | 197 ObjectMap object_map_; |
| 198 | 198 |
| 199 // Allow pack creation. | |
| 200 bool allow_pack_creation_; | |
| 201 | |
| 202 // Array required to maintain references to the currently live pack objects. | 199 // Array required to maintain references to the currently live pack objects. |
| 203 PackRefArray pack_array_; | 200 PackRefArray pack_array_; |
| 204 | 201 |
| 205 DISALLOW_COPY_AND_ASSIGN(ObjectManager); | 202 DISALLOW_COPY_AND_ASSIGN(ObjectManager); |
| 206 }; | 203 }; |
| 207 } // namespace o3d | 204 } // namespace o3d |
| 208 | 205 |
| 209 #endif // O3D_CORE_CROSS_OBJECT_MANAGER_H_ | 206 #endif // O3D_CORE_CROSS_OBJECT_MANAGER_H_ |
| OLD | NEW |