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 29 matching lines...) Expand all Loading... |
40 #include "core/cross/object_manager.h" | 40 #include "core/cross/object_manager.h" |
41 | 41 |
42 namespace o3d { | 42 namespace o3d { |
43 | 43 |
44 ClientInfo::ClientInfo() | 44 ClientInfo::ClientInfo() |
45 : num_objects_(0), | 45 : num_objects_(0), |
46 texture_memory_used_(0), | 46 texture_memory_used_(0), |
47 buffer_memory_used_(0), | 47 buffer_memory_used_(0), |
48 software_renderer_(false), | 48 software_renderer_(false), |
49 non_power_of_two_textures_(false), | 49 non_power_of_two_textures_(false), |
| 50 render_2d_(false), |
50 version_(O3D_PLUGIN_VERSION) { | 51 version_(O3D_PLUGIN_VERSION) { |
51 } | 52 } |
52 | 53 |
53 const InterfaceId ClientInfoManager::kInterfaceId = | 54 const InterfaceId ClientInfoManager::kInterfaceId = |
54 InterfaceTraits<ClientInfoManager>::kInterfaceId; | 55 InterfaceTraits<ClientInfoManager>::kInterfaceId; |
55 | 56 |
56 ClientInfoManager::ClientInfoManager(ServiceLocator* service_locator) | 57 ClientInfoManager::ClientInfoManager(ServiceLocator* service_locator) |
57 : service_(service_locator, this) { | 58 : service_(service_locator, this) { |
58 } | 59 } |
59 | 60 |
60 const ClientInfo& ClientInfoManager::client_info() { | 61 const ClientInfo& ClientInfoManager::client_info() { |
61 ServiceDependency<ObjectManager> object_manager_(service_.service_locator()); | 62 ServiceDependency<ObjectManager> object_manager_(service_.service_locator()); |
62 client_info_.num_objects_ = object_manager_->GetNumObjects(); | 63 client_info_.num_objects_ = object_manager_->GetNumObjects(); |
63 return client_info_; | 64 return client_info_; |
64 } | 65 } |
65 | 66 |
66 } // namespace o3d | 67 } // namespace o3d |
OLD | NEW |