ic
/
magnum
mirror of https://github.com/mosra/magnum.git
6
0
Fork 0
Code Issues Projects Releases Wiki Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
7936 Commits
21 Branches
19 Tags
70 MiB
Tree: 5f7f219d75
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '5f7f219d75'
${ noResults }
magnum/src/Magnum/Trade/PhongMaterialData.cpp

131 lines
6.3 KiB
Raw Normal View History Unescape

Trade: improved *Data constructors and destructors. * They are now deinlined into source files, as most of the classes have either heavy members (std::vector) or virtual methods. * All of them are explicit now (that should be already done, don't know why not). * Passing huge classes by value and using move constructors to avoid unnecessary copying.
13 years ago
/*
This file is part of Magnum.
Updated copyright year.
7 years ago
Copyright © 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019
Happy new year too.
12 years ago
Vladimír Vondruš <mosra@centrum.cz>
Trade: improved *Data constructors and destructors. * They are now deinlined into source files, as most of the classes have either heavy members (std::vector) or virtual methods. * All of them are explicit now (that should be already done, don't know why not). * Passing huge classes by value and using move constructors to avoid unnecessary copying.
13 years ago
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
*/
#include "PhongMaterialData.h"
Trade: debug output for PhongMaterialData::Flag[s].
8 years ago
#include <Corrade/Containers/EnumSet.hpp>
Trade: improved *Data constructors and destructors. * They are now deinlined into source files, as most of the classes have either heavy members (std::vector) or virtual methods. * All of them are explicit now (that should be already done, don't know why not). * Passing huge classes by value and using move constructors to avoid unnecessary copying.
13 years ago
namespace Magnum { namespace Trade {
Trade: non-random defaults for PhongMaterialData.
8 years ago
using namespace Math::Literals;
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
PhongMaterialData::PhongMaterialData(const Flags flags, const Color4& ambientColor, const UnsignedInt ambientTexture, const Color4& diffuseColor, const UnsignedInt diffuseTexture, const Color4& specularColor, const UnsignedInt specularTexture, const UnsignedInt normalTexture, const Matrix3& textureMatrix, const MaterialAlphaMode alphaMode, const Float alphaMask, const Float shininess, const void* const importerState) noexcept: AbstractMaterialData{MaterialType::Phong, AbstractMaterialData::Flag(UnsignedShort(flags)), alphaMode, alphaMask, importerState}, _ambientColor{ambientColor}, _diffuseColor{diffuseColor}, _specularColor{specularColor}, _shininess{shininess} {
CORRADE_ASSERT(!(flags & Flag::TextureTransformation) || (flags & (Flag::AmbientTexture|Flag::DiffuseTexture|Flag::SpecularTexture|Flag::NormalTexture)),
"Trade::PhongMaterialData: texture transformation enabled but the material has no textures", );
if(flags & Flag::AmbientTexture)
_ambientTexture = ambientTexture;
if(flags & Flag::DiffuseTexture)
_diffuseTexture = diffuseTexture;
if(flags & Flag::SpecularTexture)
_specularTexture = specularTexture;
if(flags & Flag::NormalTexture)
_normalTexture = normalTexture;
if(flags & Flag::TextureTransformation)
_textureMatrix = textureMatrix;
Trade: non-random defaults for PhongMaterialData.
8 years ago
}
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
#ifdef MAGNUM_BUILD_DEPRECATED
PhongMaterialData::PhongMaterialData(const Flags flags, const MaterialAlphaMode alphaMode, const Float alphaMask, const Float shininess, const void* const importerState) noexcept: PhongMaterialData{flags, 0x000000ff_rgbaf, {}, 0xffffffff_rgbaf, {}, 0xffffffff_rgbaf, {}, {}, {}, alphaMode, alphaMask, shininess, importerState} {}
Trade: test construction and assignments of the container classes.
10 years ago
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
PhongMaterialData::PhongMaterialData(const Flags flags, const Float shininess, const void* const importerState) noexcept: PhongMaterialData{flags, 0x000000ff_rgbaf, {}, 0xffffffff_rgbaf, {}, 0xffffffff_rgbaf, {}, {}, {}, MaterialAlphaMode::Opaque, 0.5f, shininess, importerState} {}
#endif
Trade: test construction and assignments of the container classes.
10 years ago
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
PhongMaterialData::PhongMaterialData(PhongMaterialData&& other) noexcept = default;
Trade: test construction and assignments of the container classes.
10 years ago
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
PhongMaterialData& PhongMaterialData::operator=(PhongMaterialData&& other) noexcept = default;
Trade: test construction and assignments of the container classes.
10 years ago
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
UnsignedInt PhongMaterialData::ambientTexture() const {
CORRADE_ASSERT(flags() & Flag::AmbientTexture, "Trade::PhongMaterialData::ambientTexture(): the material doesn't have an ambient texture", {});
return _ambientTexture;
Trade: ability to have either color or texture in PhongMaterialData.
13 years ago
}
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
#ifdef MAGNUM_BUILD_DEPRECATED
Trade: ability to have either color or texture in PhongMaterialData.
13 years ago
UnsignedInt& PhongMaterialData::ambientTexture() {
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
CORRADE_ASSERT(flags() & Flag::AmbientTexture, "Trade::PhongMaterialData::ambientTexture(): the material doesn't have an ambient texture", _ambientTexture);
return _ambientTexture;
Trade: ability to have either color or texture in PhongMaterialData.
13 years ago
}
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
#endif
Trade: ability to have either color or texture in PhongMaterialData.
13 years ago
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
UnsignedInt PhongMaterialData::diffuseTexture() const {
CORRADE_ASSERT(flags() & Flag::DiffuseTexture, "Trade::PhongMaterialData::diffuseTexture(): the material doesn't have a diffuse texture", {});
return _diffuseTexture;
Trade: ability to have either color or texture in PhongMaterialData.
13 years ago
}
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
#ifdef MAGNUM_BUILD_DEPRECATED
Trade: ability to have either color or texture in PhongMaterialData.
13 years ago
UnsignedInt& PhongMaterialData::diffuseTexture() {
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
CORRADE_ASSERT(flags() & Flag::DiffuseTexture, "Trade::PhongMaterialData::diffuseTexture(): the material doesn't have a diffuse texture", _diffuseTexture);
return _diffuseTexture;
Trade: ability to have either color or texture in PhongMaterialData.
13 years ago
}
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
#endif
Trade: ability to have either color or texture in PhongMaterialData.
13 years ago
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
UnsignedInt PhongMaterialData::specularTexture() const {
CORRADE_ASSERT(flags() & Flag::SpecularTexture, "Trade::PhongMaterialData::specularTexture(): the material doesn't have a specular texture", {});
return _specularTexture;
Trade: ability to have either color or texture in PhongMaterialData.
13 years ago
}
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
#ifdef MAGNUM_BUILD_DEPRECATED
Trade: ability to have either color or texture in PhongMaterialData.
13 years ago
UnsignedInt& PhongMaterialData::specularTexture() {
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
CORRADE_ASSERT(flags() & Flag::SpecularTexture, "Trade::PhongMaterialData::specularTexture(): the material doesn't have a specular texture", _specularTexture);
return _specularTexture;
}
#endif
UnsignedInt PhongMaterialData::normalTexture() const {
CORRADE_ASSERT(flags() & Flag::NormalTexture, "Trade::PhongMaterialData::normalTexture(): the material doesn't have a normal texture", {});
return _normalTexture;
Trade: ability to have either color or texture in PhongMaterialData.
13 years ago
}
Trade: improved *Data constructors and destructors. * They are now deinlined into source files, as most of the classes have either heavy members (std::vector) or virtual methods. * All of them are explicit now (that should be already done, don't know why not). * Passing huge classes by value and using move constructors to avoid unnecessary copying.
13 years ago
Trade: debug output for PhongMaterialData::Flag[s].
8 years ago
Debug& operator<<(Debug& debug, const PhongMaterialData::Flag value) {
Reduce string duplication in enum debug output operators. Bloaty says it saved 10 kB in Debug build of MagnumGL: VM SIZE FILE SIZE -------------- -------------- [ = ] 0 .debug_info +1.59Ki +0.0% +0.4% +1.50Ki .text +1.50Ki +0.4% [ = ] 0 .debug_str +409 +0.0% [ = ] 0 .debug_line +276 +0.1% [ = ] 0 .debug_abbrev +20 +0.0% -28.6% -2 [LOAD [RX]] -2 -28.6% [ = ] 0 [Unmapped] -4.28Ki -41.0% -22.7% -9.23Ki .rodata -9.23Ki -22.7% -0.8% -7.73Ki TOTAL -9.73Ki -0.1% And 4 kB in Release: VM SIZE FILE SIZE -------------- -------------- +1.1% +3.44Ki .text +3.44Ki +1.1% +1.7% +1.39Ki .eh_frame +1.39Ki +1.7% [ = ] 0 [Unmapped] +656 +51% -25.5% -9.47Ki .rodata -9.47Ki -25.5% -0.7% -4.64Ki TOTAL -4.00Ki -0.4% That's not negative, so I guess that's good. This change is of course more significant in the context of a minimal WebGL build, where the exe can be as little as 50 kB -- there 4 kB is almost 10% of the size.
7 years ago
debug << "Trade::PhongMaterialData::Flag" << Debug::nospace;
Trade: debug output for PhongMaterialData::Flag[s].
8 years ago
switch(value) {
Trade: alpha mode, alpha mask and double sided material properties.
8 years ago
/* LCOV_EXCL_START */
Reduce string duplication in enum debug output operators. Bloaty says it saved 10 kB in Debug build of MagnumGL: VM SIZE FILE SIZE -------------- -------------- [ = ] 0 .debug_info +1.59Ki +0.0% +0.4% +1.50Ki .text +1.50Ki +0.4% [ = ] 0 .debug_str +409 +0.0% [ = ] 0 .debug_line +276 +0.1% [ = ] 0 .debug_abbrev +20 +0.0% -28.6% -2 [LOAD [RX]] -2 -28.6% [ = ] 0 [Unmapped] -4.28Ki -41.0% -22.7% -9.23Ki .rodata -9.23Ki -22.7% -0.8% -7.73Ki TOTAL -9.73Ki -0.1% And 4 kB in Release: VM SIZE FILE SIZE -------------- -------------- +1.1% +3.44Ki .text +3.44Ki +1.1% +1.7% +1.39Ki .eh_frame +1.39Ki +1.7% [ = ] 0 [Unmapped] +656 +51% -25.5% -9.47Ki .rodata -9.47Ki -25.5% -0.7% -4.64Ki TOTAL -4.00Ki -0.4% That's not negative, so I guess that's good. This change is of course more significant in the context of a minimal WebGL build, where the exe can be as little as 50 kB -- there 4 kB is almost 10% of the size.
7 years ago
#define _c(v) case PhongMaterialData::Flag::v: return debug << "::" #v;
Trade: alpha mode, alpha mask and double sided material properties.
8 years ago
_c(DoubleSided)
Trade: debug output for PhongMaterialData::Flag[s].
8 years ago
_c(AmbientTexture)
_c(DiffuseTexture)
_c(SpecularTexture)
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
_c(NormalTexture)
_c(TextureTransformation)
Trade: debug output for PhongMaterialData::Flag[s].
8 years ago
#undef _c
Trade: alpha mode, alpha mask and double sided material properties.
8 years ago
/* LCOV_EXCL_STOP */
Trade: debug output for PhongMaterialData::Flag[s].
8 years ago
}
Reduce string duplication in enum debug output operators. Bloaty says it saved 10 kB in Debug build of MagnumGL: VM SIZE FILE SIZE -------------- -------------- [ = ] 0 .debug_info +1.59Ki +0.0% +0.4% +1.50Ki .text +1.50Ki +0.4% [ = ] 0 .debug_str +409 +0.0% [ = ] 0 .debug_line +276 +0.1% [ = ] 0 .debug_abbrev +20 +0.0% -28.6% -2 [LOAD [RX]] -2 -28.6% [ = ] 0 [Unmapped] -4.28Ki -41.0% -22.7% -9.23Ki .rodata -9.23Ki -22.7% -0.8% -7.73Ki TOTAL -9.73Ki -0.1% And 4 kB in Release: VM SIZE FILE SIZE -------------- -------------- +1.1% +3.44Ki .text +3.44Ki +1.1% +1.7% +1.39Ki .eh_frame +1.39Ki +1.7% [ = ] 0 [Unmapped] +656 +51% -25.5% -9.47Ki .rodata -9.47Ki -25.5% -0.7% -4.64Ki TOTAL -4.00Ki -0.4% That's not negative, so I guess that's good. This change is of course more significant in the context of a minimal WebGL build, where the exe can be as little as 50 kB -- there 4 kB is almost 10% of the size.
7 years ago
return debug << "(" << Debug::nospace << reinterpret_cast<void*>(UnsignedByte(value)) << Debug::nospace << ")";
Trade: debug output for PhongMaterialData::Flag[s].
8 years ago
}
Debug& operator<<(Debug& debug, const PhongMaterialData::Flags value) {
return Containers::enumSetDebugOutput(debug, value, "Trade::PhongMaterialData::Flags{}", {
Trade: alpha mode, alpha mask and double sided material properties.
8 years ago
PhongMaterialData::Flag::DoubleSided,
Trade: debug output for PhongMaterialData::Flag[s].
8 years ago
PhongMaterialData::Flag::AmbientTexture,
PhongMaterialData::Flag::DiffuseTexture,
Trade: rework and extend PhongMaterialData. It now supports both color+texture (instead of just one or the other) which made it much simpler to use (and implement as well), also can reference normal maps and specify texture coordinate transformation now. The old APIs are depecated, but no tests or other code is updated yet in order to ensure everything continues to work as before.
6 years ago
PhongMaterialData::Flag::SpecularTexture,
PhongMaterialData::Flag::NormalTexture,
PhongMaterialData::Flag::TextureTransformation});
Trade: debug output for PhongMaterialData::Flag[s].
8 years ago
}
Trade: improved *Data constructors and destructors. * They are now deinlined into source files, as most of the classes have either heavy members (std::vector) or virtual methods. * All of them are explicit now (that should be already done, don't know why not). * Passing huge classes by value and using move constructors to avoid unnecessary copying.
13 years ago
}}