ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix formatting

pull/576/head
Vladislav Oleshko 4 years ago
parent
3ab4b6fef3
commit
b592fcbff3
10 changed files with 33 additions and 39 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Magnum/Shaders/DistanceFieldVectorGL.cpp
  2. 7
      src/Magnum/Shaders/FlatGL.cpp
  3. 7
      src/Magnum/Shaders/PhongGL.cpp
  4. 8
      src/Magnum/Shaders/VectorGL.cpp
  5. 8
      src/Magnum/Shaders/VertexColorGL.cpp

6
src/Magnum/Shaders/DistanceFieldVectorGL.cpp
Unescape View File

@ -162,8 +162,7 @@ template<UnsignedInt dimensions> typename DistanceFieldVectorGL<dimensions>::Com
return CompileState{std::move(out), std::move(vert), std::move(frag), version}; return CompileState{std::move(out), std::move(vert), std::move(frag), version};
} }
template<UnsignedInt dimensions> DistanceFieldVectorGL<dimensions>::DistanceFieldVectorGL(CompileState&& cs) template<UnsignedInt dimensions> DistanceFieldVectorGL<dimensions>::DistanceFieldVectorGL(CompileState&& cs): DistanceFieldVectorGL{static_cast<DistanceFieldVectorGL&&>(std::move(cs))} {
: DistanceFieldVectorGL{static_cast<DistanceFieldVectorGL&&>(std::move(cs))} {
if (id() == 0) return; if (id() == 0) return;
CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink()); CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink());
@ -237,7 +236,8 @@ template<UnsignedInt dimensions> typename DistanceFieldVectorGL<dimensions>::Com
return compile(flags, 1, 1); return compile(flags, 1, 1);
} }
template<UnsignedInt dimensions> DistanceFieldVectorGL<dimensions>::DistanceFieldVectorGL(const Flags flags, UnsignedInt materialCount, UnsignedInt drawCount): DistanceFieldVectorGL{compile(flags, materialCount, drawCount)} {} template<UnsignedInt dimensions> DistanceFieldVectorGL<dimensions>::DistanceFieldVectorGL(const Flags flags, UnsignedInt materialCount, UnsignedInt drawCount):
DistanceFieldVectorGL{compile(flags, materialCount, drawCount)} {}
#endif #endif
template<UnsignedInt dimensions> DistanceFieldVectorGL<dimensions>& DistanceFieldVectorGL<dimensions>::setTransformationProjectionMatrix(const MatrixTypeFor<dimensions, Float>& matrix) { template<UnsignedInt dimensions> DistanceFieldVectorGL<dimensions>& DistanceFieldVectorGL<dimensions>::setTransformationProjectionMatrix(const MatrixTypeFor<dimensions, Float>& matrix) {

7
src/Magnum/Shaders/FlatGL.cpp
Unescape View File

@ -237,8 +237,7 @@ template<UnsignedInt dimensions> typename FlatGL<dimensions>::CompileState FlatG
return CompileState{std::move(out), std::move(vert), std::move(frag), version}; return CompileState{std::move(out), std::move(vert), std::move(frag), version};
} }
template<UnsignedInt dimensions> FlatGL<dimensions>::FlatGL(CompileState&& cs) template<UnsignedInt dimensions> FlatGL<dimensions>::FlatGL(CompileState&& cs): FlatGL{static_cast<FlatGL&&>(std::move(cs))} {
: FlatGL{static_cast<FlatGL&&>(std::move(cs))} {
if (id() == 0) return; if (id() == 0) return;
CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink()); CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink());
@ -319,8 +318,8 @@ template<UnsignedInt dimensions> typename FlatGL<dimensions>::CompileState FlatG
return compile(flags, 1, 1); return compile(flags, 1, 1);
} }
template<UnsignedInt dimensions> FlatGL<dimensions>::FlatGL(Flags flags, UnsignedInt materialCount, UnsignedInt drawCount) template<UnsignedInt dimensions> FlatGL<dimensions>::FlatGL(Flags flags, UnsignedInt materialCount, UnsignedInt drawCount):
: FlatGL{compile(flags, materialCount, drawCount)} {} FlatGL{compile(flags, materialCount, drawCount)} {}
#endif #endif
template<UnsignedInt dimensions> FlatGL<dimensions>::FlatGL(NoInitT) {} template<UnsignedInt dimensions> FlatGL<dimensions>::FlatGL(NoInitT) {}

7
src/Magnum/Shaders/PhongGL.cpp
Unescape View File

@ -347,8 +347,7 @@ PhongGL::CompileState PhongGL::compile(const Flags flags, const UnsignedInt ligh
return CompileState{std::move(out), std::move(vert), std::move(frag), version}; return CompileState{std::move(out), std::move(vert), std::move(frag), version};
} }
PhongGL::PhongGL(CompileState&& cs) PhongGL::PhongGL(CompileState&& cs): PhongGL{static_cast<PhongGL&&>(std::move(cs))} {
: PhongGL{static_cast<PhongGL&&>(std::move(cs))} {
if (id() == 0) return; if (id() == 0) return;
CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink()); CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink());
@ -471,8 +470,8 @@ PhongGL::CompileState PhongGL::compile(Flags flags, UnsignedInt lightCount) {
return compile(flags, lightCount, 1, 1); return compile(flags, lightCount, 1, 1);
} }
PhongGL::PhongGL(Flags flags, UnsignedInt lightCount, UnsignedInt materialCount, UnsignedInt drawCount) PhongGL::PhongGL(Flags flags, UnsignedInt lightCount, UnsignedInt materialCount, UnsignedInt drawCount):
: PhongGL{compile(flags, lightCount, materialCount, drawCount)} {} PhongGL{compile(flags, lightCount, materialCount, drawCount)} {}
#endif #endif
PhongGL& PhongGL::setAmbientColor(const Magnum::Color4& color) { PhongGL& PhongGL::setAmbientColor(const Magnum::Color4& color) {

8
src/Magnum/Shaders/VectorGL.cpp
Unescape View File

@ -164,8 +164,7 @@ template<UnsignedInt dimensions> typename VectorGL<dimensions>::CompileState Vec
return CompileState{std::move(out), std::move(vert), std::move(frag), version}; return CompileState{std::move(out), std::move(vert), std::move(frag), version};
} }
template<UnsignedInt dimensions> VectorGL<dimensions>::VectorGL(CompileState&& cs) template<UnsignedInt dimensions> VectorGL<dimensions>::VectorGL(CompileState&& cs): VectorGL{static_cast<VectorGL&&>(std::move(cs))} {
: VectorGL{static_cast<VectorGL&&>(std::move(cs))} {
if (id() == 0) return; if (id() == 0) return;
CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink()); CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink());
@ -237,13 +236,12 @@ template<UnsignedInt dimensions> typename VectorGL<dimensions>::CompileState Vec
return compile(flags, 1, 1); return compile(flags, 1, 1);
} }
template<UnsignedInt dimensions> VectorGL<dimensions>::VectorGL(Flags flags, UnsignedInt materialCount, UnsignedInt drawCount) template<UnsignedInt dimensions> VectorGL<dimensions>::VectorGL(Flags flags, UnsignedInt materialCount, UnsignedInt drawCount):
: VectorGL{compile(flags, materialCount, drawCount)} {} VectorGL{compile(flags, materialCount, drawCount)} {}
#endif #endif
template<UnsignedInt dimensions> VectorGL<dimensions>::VectorGL(NoInitT) {} template<UnsignedInt dimensions> VectorGL<dimensions>::VectorGL(NoInitT) {}
template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::setTransformationProjectionMatrix(const MatrixTypeFor<dimensions, Float>& matrix) { template<UnsignedInt dimensions> VectorGL<dimensions>& VectorGL<dimensions>::setTransformationProjectionMatrix(const MatrixTypeFor<dimensions, Float>& matrix) {
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
CORRADE_ASSERT(!(_flags >= Flag::UniformBuffers), CORRADE_ASSERT(!(_flags >= Flag::UniformBuffers),

8
src/Magnum/Shaders/VertexColorGL.cpp
Unescape View File

@ -142,8 +142,7 @@ template<UnsignedInt dimensions> typename VertexColorGL<dimensions>::CompileStat
return CompileState{std::move(out), std::move(vert), std::move(frag), version}; return CompileState{std::move(out), std::move(vert), std::move(frag), version};
} }
template<UnsignedInt dimensions> VertexColorGL<dimensions>::VertexColorGL(CompileState&& cs): template<UnsignedInt dimensions> VertexColorGL<dimensions>::VertexColorGL(CompileState&& cs): VertexColorGL{static_cast<VertexColorGL&&>(std::move(cs))} {
VertexColorGL{static_cast<VertexColorGL&&>(std::move(cs))} {
if (id() == 0) return; if (id() == 0) return;
CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink()); CORRADE_INTERNAL_ASSERT_OUTPUT(checkLink());
@ -200,13 +199,12 @@ template<UnsignedInt dimensions> typename VertexColorGL<dimensions>::CompileStat
return compile(flags, 1); return compile(flags, 1);
} }
template<UnsignedInt dimensions> VertexColorGL<dimensions>::VertexColorGL(Flags flags, UnsignedInt drawCount) template<UnsignedInt dimensions> VertexColorGL<dimensions>::VertexColorGL(Flags flags, UnsignedInt drawCount):
: VertexColorGL{compile(flags, drawCount)} {} VertexColorGL{compile(flags, drawCount)} {}
#endif #endif
template<UnsignedInt dimensions> VertexColorGL<dimensions>::VertexColorGL(NoInitT) {} template<UnsignedInt dimensions> VertexColorGL<dimensions>::VertexColorGL(NoInitT) {}
template<UnsignedInt dimensions> VertexColorGL<dimensions>& VertexColorGL<dimensions>::setTransformationProjectionMatrix(const MatrixTypeFor<dimensions, Float>& matrix) { template<UnsignedInt dimensions> VertexColorGL<dimensions>& VertexColorGL<dimensions>::setTransformationProjectionMatrix(const MatrixTypeFor<dimensions, Float>& matrix) {
#ifndef MAGNUM_TARGET_GLES2 #ifndef MAGNUM_TARGET_GLES2
CORRADE_ASSERT(!(_flags >= Flag::UniformBuffers), CORRADE_ASSERT(!(_flags >= Flag::UniformBuffers),

Write Preview
Loading…
Cancel
Save