sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed errors from last merge

Browse Source 
Former-commit-id: 850eadf5e233d0d6efad039b6bd943f05384df7d
This commit is contained in:
Lynix
2015-01-19 02:32:48 +01:00
parent 304b46b17d
commit 75ffa09792
1 changed files with 105 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

133
src/Nazara/Graphics/ForwardRenderQueue.cpp
View File

@@ -85,11 +85,22 @@ void NzForwardRenderQueue::AddBillboards(const NzMaterial* material, unsigned in
if (!alphaPtr) if (!alphaPtr)
alphaPtr.Reset(&defaultAlpha, 0); // Pareil alphaPtr.Reset(&defaultAlpha, 0); // Pareil
std::vector<BillboardData>& billboardVec = billboards[material]; auto it = billboards.find(material);
unsigned int prevSize = billboardVec.size(); if (it == billboards.end())
billboardVec.resize(prevSize + count); {
BatchedBillboardEntry entry(this, ResourceType_Material);
entry.materialListener = material;
BillboardData* billboardData = &billboardVec[prevSize]; it = billboards.insert(std::make_pair(material, std::move(entry))).first;
}
BatchedBillboardEntry& entry = it->second;
auto& billboardVector = entry.billboards;
unsigned int prevSize = billboardVector.size();
billboardVector.resize(prevSize + count);
BillboardData* billboardData = &billboardVector[prevSize];
for (unsigned int i = 0; i < count; ++i) for (unsigned int i = 0; i < count; ++i)
{ {
billboardData->center = *positionPtr++; billboardData->center = *positionPtr++;
@@ -111,11 +122,22 @@ void NzForwardRenderQueue::AddBillboards(const NzMaterial* material, unsigned in
if (!colorPtr) if (!colorPtr)
colorPtr.Reset(&NzColor::White, 0); // Pareil colorPtr.Reset(&NzColor::White, 0); // Pareil
std::vector<BillboardData>& billboardVec = billboards[material]; auto it = billboards.find(material);
unsigned int prevSize = billboardVec.size(); if (it == billboards.end())
billboardVec.resize(prevSize + count); {
BatchedBillboardEntry entry(this, ResourceType_Material);
entry.materialListener = material;
BillboardData* billboardData = &billboardVec[prevSize]; it = billboards.insert(std::make_pair(material, std::move(entry))).first;
}
BatchedBillboardEntry& entry = it->second;
auto& billboardVector = entry.billboards;
unsigned int prevSize = billboardVector.size();
billboardVector.resize(prevSize + count);
BillboardData* billboardData = &billboardVector[prevSize];
for (unsigned int i = 0; i < count; ++i) for (unsigned int i = 0; i < count; ++i)
{ {
float sin = std::sin(NzToRadians(*anglePtr)); float sin = std::sin(NzToRadians(*anglePtr));
@@ -143,11 +165,22 @@ void NzForwardRenderQueue::AddBillboards(const NzMaterial* material, unsigned in
if (!alphaPtr) if (!alphaPtr)
alphaPtr.Reset(&defaultAlpha, 0); // Pareil alphaPtr.Reset(&defaultAlpha, 0); // Pareil
std::vector<BillboardData>& billboardVec = billboards[material]; auto it = billboards.find(material);
unsigned int prevSize = billboardVec.size(); if (it == billboards.end())
billboardVec.resize(prevSize + count); {
BatchedBillboardEntry entry(this, ResourceType_Material);
entry.materialListener = material;
BillboardData* billboardData = &billboardVec[prevSize]; it = billboards.insert(std::make_pair(material, std::move(entry))).first;
}
BatchedBillboardEntry& entry = it->second;
auto& billboardVector = entry.billboards;
unsigned int prevSize = billboardVector.size();
billboardVector.resize(prevSize + count);
BillboardData* billboardData = &billboardVector[prevSize];
for (unsigned int i = 0; i < count; ++i) for (unsigned int i = 0; i < count; ++i)
{ {
float sin = std::sin(NzToRadians(*anglePtr)); float sin = std::sin(NzToRadians(*anglePtr));
@@ -173,11 +206,22 @@ void NzForwardRenderQueue::AddBillboards(const NzMaterial* material, unsigned in
if (!colorPtr) if (!colorPtr)
colorPtr.Reset(&NzColor::White, 0); // Pareil colorPtr.Reset(&NzColor::White, 0); // Pareil
std::vector<BillboardData>& billboardVec = billboards[material]; auto it = billboards.find(material);
unsigned int prevSize = billboardVec.size(); if (it == billboards.end())
billboardVec.resize(prevSize + count); {
BatchedBillboardEntry entry(this, ResourceType_Material);
entry.materialListener = material;
BillboardData* billboardData = &billboardVec[prevSize]; it = billboards.insert(std::make_pair(material, std::move(entry))).first;
}
BatchedBillboardEntry& entry = it->second;
auto& billboardVector = entry.billboards;
unsigned int prevSize = billboardVector.size();
billboardVector.resize(prevSize + count);
BillboardData* billboardData = &billboardVector[prevSize];
for (unsigned int i = 0; i < count; ++i) for (unsigned int i = 0; i < count; ++i)
{ {
billboardData->center = *positionPtr++; billboardData->center = *positionPtr++;
@@ -201,11 +245,22 @@ void NzForwardRenderQueue::AddBillboards(const NzMaterial* material, unsigned in
if (!alphaPtr) if (!alphaPtr)
alphaPtr.Reset(&defaultAlpha, 0); // Pareil alphaPtr.Reset(&defaultAlpha, 0); // Pareil
std::vector<BillboardData>& billboardVec = billboards[material]; auto it = billboards.find(material);
unsigned int prevSize = billboardVec.size(); if (it == billboards.end())
billboardVec.resize(prevSize + count); {
BatchedBillboardEntry entry(this, ResourceType_Material);
entry.materialListener = material;
BillboardData* billboardData = &billboardVec[prevSize]; it = billboards.insert(std::make_pair(material, std::move(entry))).first;
}
BatchedBillboardEntry& entry = it->second;
auto& billboardVector = entry.billboards;
unsigned int prevSize = billboardVector.size();
billboardVector.resize(prevSize + count);
BillboardData* billboardData = &billboardVector[prevSize];
for (unsigned int i = 0; i < count; ++i) for (unsigned int i = 0; i < count; ++i)
{ {
billboardData->center = *positionPtr++; billboardData->center = *positionPtr++;
@@ -227,11 +282,22 @@ void NzForwardRenderQueue::AddBillboards(const NzMaterial* material, unsigned in
if (!colorPtr) if (!colorPtr)
colorPtr.Reset(&NzColor::White, 0); // Pareil colorPtr.Reset(&NzColor::White, 0); // Pareil
std::vector<BillboardData>& billboardVec = billboards[material]; auto it = billboards.find(material);
unsigned int prevSize = billboardVec.size(); if (it == billboards.end())
billboardVec.resize(prevSize + count); {
BatchedBillboardEntry entry(this, ResourceType_Material);
entry.materialListener = material;
BillboardData* billboardData = &billboardVec[prevSize]; it = billboards.insert(std::make_pair(material, std::move(entry))).first;
}
BatchedBillboardEntry& entry = it->second;
auto& billboardVector = entry.billboards;
unsigned int prevSize = billboardVector.size();
billboardVector.resize(prevSize + count);
BillboardData* billboardData = &billboardVector[prevSize];
for (unsigned int i = 0; i < count; ++i) for (unsigned int i = 0; i < count; ++i)
{ {
float sin = std::sin(NzToRadians(*anglePtr)); float sin = std::sin(NzToRadians(*anglePtr));
@@ -259,11 +325,22 @@ void NzForwardRenderQueue::AddBillboards(const NzMaterial* material, unsigned in
if (!alphaPtr) if (!alphaPtr)
alphaPtr.Reset(&defaultAlpha, 0); // Pareil alphaPtr.Reset(&defaultAlpha, 0); // Pareil
std::vector<BillboardData>& billboardVec = billboards[material]; auto it = billboards.find(material);
unsigned int prevSize = billboardVec.size(); if (it == billboards.end())
billboardVec.resize(prevSize + count); {
BatchedBillboardEntry entry(this, ResourceType_Material);
entry.materialListener = material;
BillboardData* billboardData = &billboardVec[prevSize]; it = billboards.insert(std::make_pair(material, std::move(entry))).first;
}
BatchedBillboardEntry& entry = it->second;
auto& billboardVector = entry.billboards;
unsigned int prevSize = billboardVector.size();
billboardVector.resize(prevSize + count);
BillboardData* billboardData = &billboardVector[prevSize];
for (unsigned int i = 0; i < count; ++i) for (unsigned int i = 0; i < count; ++i)
{ {
float sin = std::sin(NzToRadians(*anglePtr)); float sin = std::sin(NzToRadians(*anglePtr));