Skip to content

Commit

Permalink
Apply clang-format changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@sturnclaw
sturnclaw committed Sep 1, 2020
1 parent 2d9531d commit 753b36a
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 44 deletions.
2 changes: 1 addition & 1 deletion src/BaseSphere.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include "GasGiant.h"
#include "GeoSphere.h"

#include "graphics/Renderer.h"
#include "graphics/Drawables.h"
#include "graphics/Renderer.h"

BaseSphere::BaseSphere(const SystemBody *body) :
m_sbody(body),
Expand Down
2 changes: 1 addition & 1 deletion src/galaxy/GalaxyGenerator.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ void GalaxyGenerator::ToJson(Json &jsonObj, RefCountedPtr<Galaxy> galaxy)
sysgen->ToJson(starSystemStageArrayEl, galaxy);
starSystemStageArray.push_back(starSystemStageArrayEl); // Append system stage object to array.
}
galaxyGenObj["sector_stage"] = sectorStageArray; // Add sector stage array to galaxy generator object.
galaxyGenObj["sector_stage"] = sectorStageArray; // Add sector stage array to galaxy generator object.
galaxyGenObj["star_system_stage"] = starSystemStageArray; // Add system stage array to galaxy generator object.

jsonObj["galaxy_generator"] = galaxyGenObj; // Add galaxy generator object to supplied object.
Expand Down
79 changes: 38 additions & 41 deletions src/graphics/TextureBuilder.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "utils.h"
#include <SDL_image.h>
#include <SDL_rwops.h>
#include <sstream>
#include <algorithm>
#include <sstream>

namespace Graphics {

Expand Down Expand Up @@ -73,29 +73,29 @@ namespace Graphics {
#error "SDL surface pixel formats are endian-specific"
#endif
static SDL_PixelFormat pixelFormatRGBA = {
0, // format#
0, // palette
32, // bits per pixel
4, // bytes per pixel
{ 0, 0 }, // padding
0, // format#
0, // palette
32, // bits per pixel
4, // bytes per pixel
{ 0, 0 }, // padding
0xff, 0xff00, 0xff0000, 0xff000000, // RGBA mask
0, 0, 0, 0, // RGBA loss
24, 16, 8, 0, // RGBA shift
0, // colour key
0 // alpha
0, 0, 0, 0, // RGBA loss
24, 16, 8, 0, // RGBA shift
0, // colour key
0 // alpha
};

static SDL_PixelFormat pixelFormatRGB = {
0, // format#
0, // palette
24, // bits per pixel
3, // bytes per pixel
{ 0, 0 }, // padding
0, // format#
0, // palette
24, // bits per pixel
3, // bytes per pixel
{ 0, 0 }, // padding
0xff, 0xff00, 0xff0000, 0, // RGBA mask
0, 0, 0, 0, // RGBA loss
16, 8, 0, 0, // RGBA shift
0, // colour key
0 // alpha
0, 0, 0, 0, // RGBA loss
16, 8, 0, 0, // RGBA shift
0, // colour key
0 // alpha
};

static inline bool GetTargetFormat(const SDL_PixelFormat *sourcePixelFormat, TextureFormat *targetTextureFormat, SDL_PixelFormat **targetPixelFormat, bool forceRGBA)
Expand Down Expand Up @@ -201,7 +201,7 @@ namespace Graphics {
Output("WARNING: texture '%s' is not power-of-two and may not display correctly\n", m_filenames.front().c_str());
}
} else {
if(m_textureType != TEXTURE_2D_ARRAY) {
if (m_textureType != TEXTURE_2D_ARRAY) {
switch (m_dds.GetTextureFormat()) {
case PicoDDS::FORMAT_DXT1: targetTextureFormat = TEXTURE_DXT1; break;
case PicoDDS::FORMAT_DXT5: targetTextureFormat = TEXTURE_DXT5; break;
Expand All @@ -219,25 +219,25 @@ namespace Graphics {
// Cube map must be fully defined (6 images) to be used correctly
assert(numberOfImages == 6);
}
} else if(m_textureType == TEXTURE_2D_ARRAY) {
} else if (m_textureType == TEXTURE_2D_ARRAY) {
assert(m_ddsarray.size() == m_layers);
assert(m_layers>0);
switch(m_ddsarray[0].GetTextureFormat()) {
assert(m_layers > 0);
switch (m_ddsarray[0].GetTextureFormat()) {
case PicoDDS::FORMAT_DXT1: targetTextureFormat = TEXTURE_DXT1; break;
case PicoDDS::FORMAT_DXT5: targetTextureFormat = TEXTURE_DXT5; break;
default:
Output("ERROR: DDS texture with invalid format '%s' (only DXT1 and DXT5 are supported)\n", m_filenames.front().c_str());
assert(false);
return;
}
for(size_t i=0; i<m_layers; i++) {
for (size_t i = 0; i < m_layers; i++) {
const PicoDDS::DDSImage &dds = m_ddsarray[0];
virtualWidth = actualWidth = dds.imgdata_.width;
virtualHeight = actualHeight = dds.imgdata_.height;
numberOfMipMaps = dds.imgdata_.numMipMaps;
numberOfImages += dds.imgdata_.numImages;
}
assert((numberOfImages-1) == m_layers);
assert((numberOfImages - 1) == m_layers);
} else {
Output("ERROR: unexpected texture type");
abort();
Expand All @@ -246,7 +246,7 @@ namespace Graphics {

m_descriptor = TextureDescriptor(
targetTextureFormat,
vector3f(actualWidth,actualHeight,m_layers),
vector3f(actualWidth, actualHeight, m_layers),
vector2f(float(virtualWidth) / float(actualWidth), float(virtualHeight) / float(actualHeight)),
m_sampleMode, m_generateMipmaps, m_compressTextures, m_anisotropicFiltering, numberOfMipMaps, m_textureType);

Expand Down Expand Up @@ -279,7 +279,7 @@ namespace Graphics {
}
} else if (m_textureType == TEXTURE_CUBE_MAP) {
Output("LoadSurface: %s: cannot load non-DDS cubemaps\n", m_filenames.front().c_str());
} else if(m_textureType == TEXTURE_2D_ARRAY) {
} else if (m_textureType == TEXTURE_2D_ARRAY) {
Output("LoadSurface: %s: cannot load non-DDS texture array files\n", m_filenames.front().c_str());
}

Expand All @@ -293,21 +293,18 @@ namespace Graphics {
PROFILE_SCOPED()
assert(!m_surface);
assert(!m_dds.headerdone_);
if(m_textureType != TEXTURE_2D_ARRAY)
{
if (m_textureType != TEXTURE_2D_ARRAY) {
LoadDDSFromFile(m_filenames.front(), m_dds);

if (!m_dds.headerdone_) {
m_surface = LoadSurfaceFromFile("textures/unknown.png");
}
} else if(m_textureType == TEXTURE_2D_ARRAY)
{
} else if (m_textureType == TEXTURE_2D_ARRAY) {
m_ddsarray.clear();
const size_t layers = m_layers;
m_ddsarray.resize(layers);

for (size_t i = 0; i < layers; i++)
{
for (size_t i = 0; i < layers; i++) {
PiVerify(LoadDDSFromFile(m_filenames[i], m_ddsarray[i]));
}
}
Expand All @@ -318,7 +315,7 @@ namespace Graphics {
{
if (m_surface) {
if (texture->GetDescriptor().type == TEXTURE_2D && m_textureType == TEXTURE_2D) {
texture->Update(m_surface->pixels, vector3f(m_surface->w,m_surface->h,0.0f), m_descriptor.format, 0);
texture->Update(m_surface->pixels, vector3f(m_surface->w, m_surface->h, 0.0f), m_descriptor.format, 0);
} else if (texture->GetDescriptor().type == TEXTURE_CUBE_MAP && m_textureType == TEXTURE_CUBE_MAP) {
assert(m_cubemap.size() == 6);
TextureCubeData tcd;
Expand All @@ -329,16 +326,16 @@ namespace Graphics {
tcd.negY = m_cubemap[3]->pixels;
tcd.posZ = m_cubemap[4]->pixels;
tcd.negZ = m_cubemap[5]->pixels;
texture->Update(tcd, vector3f(m_cubemap[0]->w, m_cubemap[0]->h,0.0f), m_descriptor.format, 0);
texture->Update(tcd, vector3f(m_cubemap[0]->w, m_cubemap[0]->h, 0.0f), m_descriptor.format, 0);
} else {
// Given texture and current texture don't have the same type!
assert(0);
}
} else if( m_dds.headerdone_ ) {
} else if (m_dds.headerdone_) {
assert(m_dds.headerdone_);
assert(m_descriptor.format == TEXTURE_DXT1 || m_descriptor.format == TEXTURE_DXT5);
if (texture->GetDescriptor().type == TEXTURE_2D && m_textureType == TEXTURE_2D) {
texture->Update(m_dds.imgdata_.imgData, vector3f(m_dds.imgdata_.width,m_dds.imgdata_.height,0.0f), m_descriptor.format, m_dds.imgdata_.numMipMaps);
texture->Update(m_dds.imgdata_.imgData, vector3f(m_dds.imgdata_.width, m_dds.imgdata_.height, 0.0f), m_descriptor.format, m_dds.imgdata_.numMipMaps);
} else if (texture->GetDescriptor().type == TEXTURE_CUBE_MAP && m_textureType == TEXTURE_CUBE_MAP) {
TextureCubeData tcd;
// Size in bytes of each cube map face
Expand All @@ -350,20 +347,20 @@ namespace Graphics {
tcd.negY = static_cast<void *>(m_dds.imgdata_.imgData + (3 * face_size));
tcd.posZ = static_cast<void *>(m_dds.imgdata_.imgData + (4 * face_size));
tcd.negZ = static_cast<void *>(m_dds.imgdata_.imgData + (5 * face_size));
texture->Update(tcd, vector3f(m_dds.imgdata_.width, m_dds.imgdata_.height,0.0f), m_descriptor.format, m_dds.imgdata_.numMipMaps);
texture->Update(tcd, vector3f(m_dds.imgdata_.width, m_dds.imgdata_.height, 0.0f), m_descriptor.format, m_dds.imgdata_.numMipMaps);
} else {
// Given texture and current texture don't have the same type!
assert(0);
}
} else if( !m_ddsarray.empty() ) {
} else if (!m_ddsarray.empty()) {
// texture array
assert(m_textureType == TEXTURE_2D_ARRAY);
const TextureDescriptor &desc = texture->GetDescriptor();
// virtual void Update(const vecDataPtr &data, const vector3f &dataSize, const TextureFormat format, const unsigned int numMips = 0) = 0;
Texture::vecDataPtr dataPtrs;
dataPtrs.reserve(m_layers);
for(size_t i=0; i<m_layers; i++) {
dataPtrs.push_back( m_ddsarray[i].imgdata_.imgData );
for (size_t i = 0; i < m_layers; i++) {
dataPtrs.push_back(m_ddsarray[i].imgdata_.imgData);
}
texture->Update(dataPtrs, desc.dataSize, desc.format, desc.numberOfMipMaps);
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/Gui.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

#include "Gui.h"
#include "graphics/Graphics.h"
#include "graphics/Renderer.h"
#include "graphics/RenderState.h"
#include "graphics/Renderer.h"
#include "libs.h"

namespace Gui {
Expand Down

0 comments on commit 753b36a

Please sign in to comment.