| 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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 | 62 |
| 63 using std::map; | 63 using std::map; |
| 64 using std::vector; | 64 using std::vector; |
| 65 using std::make_pair; | 65 using std::make_pair; |
| 66 | 66 |
| 67 namespace o3d { | 67 namespace o3d { |
| 68 | 68 |
| 69 // Client constructor. Creates the default root node for the scenegraph | 69 // Client constructor. Creates the default root node for the scenegraph |
| 70 Client::Client(ServiceLocator* service_locator) | 70 Client::Client(ServiceLocator* service_locator) |
| 71 : service_locator_(service_locator), | 71 : service_locator_(service_locator), |
| 72 object_manager_(service_locator_), | 72 object_manager_(service_locator), |
| 73 profiler_(service_locator), | 73 profiler_(service_locator), |
| 74 error_status_(service_locator_), | 74 error_status_(service_locator), |
| 75 draw_list_manager_(service_locator_), | 75 draw_list_manager_(service_locator), |
| 76 counter_manager_(service_locator_), | 76 counter_manager_(service_locator), |
| 77 transformation_context_(service_locator_), | 77 transformation_context_(service_locator), |
| 78 semantic_manager_(service_locator_), | 78 semantic_manager_(service_locator), |
| 79 rendering_(false), | 79 rendering_(false), |
| 80 render_tree_called_(false), | 80 render_tree_called_(false), |
| 81 renderer_(service_locator_), | 81 renderer_(service_locator), |
| 82 evaluation_counter_(service_locator_), | 82 evaluation_counter_(service_locator), |
| 83 event_manager_(), | 83 event_manager_(), |
| 84 root_(NULL), | 84 root_(NULL), |
| 85 render_mode_(RENDERMODE_CONTINUOUS), | 85 render_mode_(RENDERMODE_CONTINUOUS), |
| 86 last_tick_time_(0), | 86 last_tick_time_(0), |
| 87 #ifdef OS_WIN | 87 #ifdef OS_WIN |
| 88 calls_(0), | 88 calls_(0), |
| 89 #endif | 89 #endif |
| 90 rendergraph_root_(NULL), | 90 rendergraph_root_(NULL), |
| 91 id_(IdManager::CreateId()) { | 91 id_(IdManager::CreateId()) { |
| 92 // Create and initialize the message queue to allow external code to | 92 // Create and initialize the message queue to allow external code to |
| (...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 444 } | 444 } |
| 445 | 445 |
| 446 String Client::ProfileToString() { | 446 String Client::ProfileToString() { |
| 447 StringWriter string_writer(StringWriter::LF); | 447 StringWriter string_writer(StringWriter::LF); |
| 448 JsonWriter json_writer(&string_writer, 2); | 448 JsonWriter json_writer(&string_writer, 2); |
| 449 profiler_->Write(&json_writer); | 449 profiler_->Write(&json_writer); |
| 450 json_writer.Close(); | 450 json_writer.Close(); |
| 451 return string_writer.ToString(); | 451 return string_writer.ToString(); |
| 452 } | 452 } |
| 453 } // namespace o3d | 453 } // namespace o3d |
| OLD | NEW |
|---|
Chromium Code Reviews
