SHS/qglengine
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

small refactoring

Browse Source
This commit is contained in:
Бычков Андрей
2021-05-31 12:47:46 +03:00
parent 5eaa20202b
commit a9f7408e71
44 changed files with 86 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/glmaterial.h
View File

@@ -70,7 +70,6 @@ public:
Map map_relief ;
bool _changed;
int _index;
//GLCubeTexture map_reflection;
};
@@ -93,13 +92,10 @@ inline QDataStream & operator <<(QDataStream & s, const Material * m) {
cs.add(1, m->name).add(2, m->color_diffuse).add(4, m->color_emission)
.add(5, m->transparency).add(6, m->reflectivity).add(7, m->glass).add(8, m->map_diffuse).add(9, m->map_normal)
.add(10, m->map_relief).add(11, m->map_metalness).add(12, m->map_roughness).add(13, m->map_emission);
s << /*qCompress*/(cs.data()); return s;
s << (cs.data()); return s;
}
inline QDataStream & operator >>(QDataStream & s, Material *& m) {
m = new Material();
//QByteArray ba;
//s >> ba;
//ba = qUncompres(ba);
ChunkStream cs(s);
while (!cs.atEnd()) {
switch (cs.read()) {