History

merge from upstream

Seth Alves committed 11 years ago

Commit fecdc082 parents cdc2652 cf88bce73 files · +370 −457Browse files

Showing the changes to libraries/render-utils/src/Model.cpp (1 of 73 files). Show all

Unified · Split

libraries/render-utils/src/Model.cpp+27−13
@@ -114,12 +114,10 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key, · 113 unmodified lines
114114 gpu::ShaderPointer program = gpu::ShaderPointer(gpu::Shader::createProgram(vertexShader, pixelShader));
115115 gpu::Shader::makeProgram(*program, slotBindings);
116116
117−
118− auto locations = std::shared_ptr<Locations>(new Locations());
117+ auto locations = std::make_shared<Locations>();
119118 initLocations(program, *locations);
120119
121−
122− gpu::StatePointer state = gpu::StatePointer(new gpu::State());
120+ auto state = std::make_shared<gpu::State>();
123121
124122 // Backface on shadow
125123 if (key.isShadow()) {
@@ -147,8 +145,13 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key, · 21 unmodified lines
147145 if (!key.isWireFrame()) {
148146
149147 RenderKey wireframeKey(key.getRaw() | RenderKey::IS_WIREFRAME);
148+<<<<<<< HEAD
150149 gpu::StatePointer wireframeState = gpu::StatePointer(new gpu::State(state->getValues()));
151150
151+=======
152+ auto wireframeState = std::make_shared<gpu::State>(state->getValues());
153+
154+>>>>>>> cf88bce0820df76a55473370db0fcb8c5fe6763d
152155 wireframeState->setFillMode(gpu::State::FILL_LINE);
153156
154157 // create a new RenderPipeline with the same shader side and the mirrorState
@@ -160,7 +163,7 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key, · 5 unmodified lines
160163 if (!key.isShadow()) {
161164
162165 RenderKey mirrorKey(key.getRaw() | RenderKey::IS_MIRROR);
163− gpu::StatePointer mirrorState = gpu::StatePointer(new gpu::State(state->getValues()));
166+ auto mirrorState = std::make_shared<gpu::State>(state->getValues());
164167
165168 mirrorState->setFrontFaceClockwise(true);
166169
@@ -170,8 +173,13 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key, · 3 unmodified lines
170173
171174 if (!key.isWireFrame()) {
172175 RenderKey wireframeKey(key.getRaw() | RenderKey::IS_MIRROR | RenderKey::IS_WIREFRAME);
176+<<<<<<< HEAD
173177 gpu::StatePointer wireframeState = gpu::StatePointer(new gpu::State(state->getValues()));;
174178
179+=======
180+ auto wireframeState = std::make_shared<gpu::State>(state->getValues());
181+
182+>>>>>>> cf88bce0820df76a55473370db0fcb8c5fe6763d
175183 wireframeState->setFillMode(gpu::State::FILL_LINE);
176184
177185 // create a new RenderPipeline with the same shader side and the mirrorState
@@ -491,9 +499,15 @@ bool Model::updateGeometry() { · 313 unmodified lines
491499 foreach (const FBXMesh& mesh, fbxGeometry.meshes) {
492500 MeshState state;
493501 state.clusterMatrices.resize(mesh.clusters.size());
502+<<<<<<< HEAD
494503 _meshStates.append(state);
495504
496505 gpu::BufferPointer buffer(new gpu::Buffer());
506+=======
507+ _meshStates.append(state);
508+
509+ auto buffer = std::make_shared<gpu::Buffer>();
510+>>>>>>> cf88bce0820df76a55473370db0fcb8c5fe6763d
497511 if (!mesh.blendshapes.isEmpty()) {
498512 buffer->resize((mesh.vertices.size() + mesh.normals.size()) * sizeof(glm::vec3));
499513 buffer->setSubData(0, mesh.vertices.size() * sizeof(glm::vec3), (gpu::Byte*) mesh.vertices.constData());
@@ -906,7 +920,7 @@ bool Model::addToScene(std::shared_ptr<render::Scene> scene, render::PendingChan · 406 unmodified lines
906920 foreach (auto renderItem, _transparentRenderItems) {
907921 auto item = scene->allocateID();
908922 auto renderData = MeshPartPayload::Pointer(renderItem);
909− auto renderPayload = render::PayloadPointer(new MeshPartPayload::Payload(renderData));
923+ auto renderPayload = std::make_shared<MeshPartPayload::Payload>(renderData);
910924 pendingChanges.resetItem(item, renderPayload);
911925 _renderItems.insert(item, renderPayload);
912926 somethingAdded = true;
@@ -915,7 +929,7 @@ bool Model::addToScene(std::shared_ptr<render::Scene> scene, render::PendingChan · 2 unmodified lines
915929 foreach (auto renderItem, _opaqueRenderItems) {
916930 auto item = scene->allocateID();
917931 auto renderData = MeshPartPayload::Pointer(renderItem);
918− auto renderPayload = render::PayloadPointer(new MeshPartPayload::Payload(renderData));
932+ auto renderPayload = std::make_shared<MeshPartPayload::Payload>(renderData);
919933 pendingChanges.resetItem(item, renderPayload);
920934 _renderItems.insert(item, renderPayload);
921935 somethingAdded = true;
@@ -936,7 +950,7 @@ bool Model::addToScene(std::shared_ptr<render::Scene> scene, render::PendingChan · 14 unmodified lines
936950 foreach (auto renderItem, _transparentRenderItems) {
937951 auto item = scene->allocateID();
938952 auto renderData = MeshPartPayload::Pointer(renderItem);
939− auto renderPayload = render::PayloadPointer(new MeshPartPayload::Payload(renderData));
953+ auto renderPayload = std::make_shared<MeshPartPayload::Payload>(renderData);
940954 renderPayload->addStatusGetters(statusGetters);
941955 pendingChanges.resetItem(item, renderPayload);
942956 _renderItems.insert(item, renderPayload);
@@ -946,7 +960,7 @@ bool Model::addToScene(std::shared_ptr<render::Scene> scene, render::PendingChan · 3 unmodified lines
946960 foreach (auto renderItem, _opaqueRenderItems) {
947961 auto item = scene->allocateID();
948962 auto renderData = MeshPartPayload::Pointer(renderItem);
949− auto renderPayload = render::PayloadPointer(new MeshPartPayload::Payload(renderData));
963+ auto renderPayload = std::make_shared<MeshPartPayload::Payload>(renderData);
950964 renderPayload->addStatusGetters(statusGetters);
951965 pendingChanges.resetItem(item, renderPayload);
952966 _renderItems.insert(item, renderPayload);
@@ -2276,9 +2290,9 @@ void Model::segregateMeshGroups() { · 1323 unmodified lines
22762290 for (int partIndex = 0; partIndex < totalParts; partIndex++) {
22772291 // this is a good place to create our renderPayloads
22782292 if (translucentMesh) {
2279− _transparentRenderItems << std::shared_ptr<MeshPartPayload>(new MeshPartPayload(true, this, i, partIndex));
2293+ _transparentRenderItems << std::make_shared<MeshPartPayload>(true, this, i, partIndex);
22802294 } else {
2281− _opaqueRenderItems << std::shared_ptr<MeshPartPayload>(new MeshPartPayload(false, this, i, partIndex));
2295+ _opaqueRenderItems << std::make_shared<MeshPartPayload>(false, this, i, partIndex);
22822296 }
22832297 }
22842298 }
@@ -2326,7 +2340,7 @@ bool Model::initWhenReady(render::ScenePointer scene) { · 41 unmodified lines
23262340 foreach (auto renderItem, _transparentRenderItems) {
23272341 auto item = scene->allocateID();
23282342 auto renderData = MeshPartPayload::Pointer(renderItem);
2329− auto renderPayload = render::PayloadPointer(new MeshPartPayload::Payload(renderData));
2343+ auto renderPayload = std::make_shared<MeshPartPayload::Payload>(renderData);
23302344 _renderItems.insert(item, renderPayload);
23312345 pendingChanges.resetItem(item, renderPayload);
23322346 }
@@ -2334,7 +2348,7 @@ bool Model::initWhenReady(render::ScenePointer scene) { · 1 unmodified line
23342348 foreach (auto renderItem, _opaqueRenderItems) {
23352349 auto item = scene->allocateID();
23362350 auto renderData = MeshPartPayload::Pointer(renderItem);
2337− auto renderPayload = render::PayloadPointer(new MeshPartPayload::Payload(renderData));
2351+ auto renderPayload = std::make_shared<MeshPartPayload::Payload>(renderData);
23382352 _renderItems.insert(item, renderPayload);
23392353 pendingChanges.resetItem(item, renderPayload);
23402354 }