SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@613 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2019-10-11 13:34:03 +00:00
parent 7aa7ead1d5
commit a36ef5eb1d
5 changed files with 189 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
qglview/glmaterial.h
View File

@@ -99,10 +99,11 @@ protected:
class Map {
public:
Map() {bitmap_id = 0; color_amount = 1.f; color_offset = 0.f; animation_frame_rate = -1.f;}
Map() {bitmap_id = 0; color_amount = 1.f; color_offset = 0.f; animation_frame_rate = -1.f; bitmap_scale = QPointF(1., 1.);}
QString bitmap_path;
GLuint bitmap_id;
QPointF bitmap_offset;
QPointF bitmap_scale;
float color_amount;
float color_offset;
QString animation;
@@ -138,18 +139,19 @@ public:
inline QDataStream & operator <<(QDataStream & s, const Map & m) {
ChunkStream cs;
cs << cs.chunk(1, m.bitmap_path) << cs.chunk(2, m.color_amount) << cs.chunk(3, m.color_offset) << cs.chunk(4, m.animation) << cs.chunk(5, m.animation_frame_rate);
cs.add(1, m.bitmap_path).add(2, m.color_amount).add(3, m.color_offset).add(4, m.animation).add(5, m.animation_frame_rate).add(6, m.bitmap_scale);
s << cs.data(); return s;
}
inline QDataStream & operator >>(QDataStream & s, Map & m) {
ChunkStream cs(s);
while (!cs.atEnd()) {
switch (cs.read()) {
case 1: m.bitmap_path = cs.getData<QString>(); break;
case 2: m.color_amount = cs.getData<float>(); break;
case 3: m.color_offset = cs.getData<float>(); break;
case 4: m.animation = cs.getData<QString>(); break;
case 5: m.animation_frame_rate = cs.getData<float>(); break;
case 1: m.bitmap_path = cs.getData<QString>(); break;
case 2: m.color_amount = cs.getData<float>(); break;
case 3: m.color_offset = cs.getData<float>(); break;
case 4: m.animation = cs.getData<QString>(); break;
case 5: m.animation_frame_rate = cs.getData<float>(); break;
case 6: m.bitmap_scale = cs.getData<QPointF>(); break;
}
}
return s;
@@ -157,9 +159,9 @@ inline QDataStream & operator >>(QDataStream & s, Map & m) {
inline QDataStream & operator <<(QDataStream & s, const Material & m) {
ChunkStream cs;
cs << cs.chunk(1, m.name) << cs.chunk(2, m.color_diffuse) << cs.chunk(3, m.color_specular) << cs.chunk(4, m.color_self_illumination)
<< cs.chunk(5, m.transparency) << cs.chunk(6, m.reflectivity) << cs.chunk(7, m.glass) << cs.chunk(8, m.map_diffuse) << cs.chunk(9, m.map_normal)
<< cs.chunk(10, m.map_relief) << cs.chunk(11, m.map_specular) << cs.chunk(12, m.map_specularity) << cs.chunk(13, m.map_self_illumination);
cs.add(1, m.name).add(2, m.color_diffuse).add(3, m.color_specular).add(4, m.color_self_illumination)
.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_specular).add(12, m.map_specularity).add(13, m.map_self_illumination);
s << qCompress(cs.data()); return s;
}
inline QDataStream & operator >>(QDataStream & s, Material & m) {
@@ -169,19 +171,19 @@ inline QDataStream & operator >>(QDataStream & s, Material & m) {
ChunkStream cs(ba);
while (!cs.atEnd()) {
switch (cs.read()) {
case 1: m.name = cs.getData<QString>(); break;
case 2: m.color_diffuse = cs.getData<QColor>(); break;
case 3: m.color_specular = cs.getData<QColor>(); break;
case 4: m.color_self_illumination = cs.getData<QColor>(); break;
case 5: m.transparency = cs.getData<float>(); break;
case 6: m.reflectivity = cs.getData<float>(); break;
case 7: m.glass = cs.getData<bool>(); break;
case 8: m.map_diffuse = cs.getData<Map>(); break;
case 9: m.map_normal = cs.getData<Map>(); break;
case 10: m.map_relief = cs.getData<Map>(); break;
case 11: m.map_specular = cs.getData<Map>(); break;
case 12: m.map_specularity = cs.getData<Map>(); break;
case 13: m.map_self_illumination = cs.getData<Map>(); break;
case 1: m.name = cs.getData<QString>(); break;
case 2: m.color_diffuse = cs.getData<QColor>(); break;
case 3: m.color_specular = cs.getData<QColor>(); break;
case 4: m.color_self_illumination = cs.getData<QColor>(); break;
case 5: m.transparency = cs.getData<float>(); break;
case 6: m.reflectivity = cs.getData<float>(); break;
case 7: m.glass = cs.getData<bool>(); break;
case 8: m.map_diffuse = cs.getData<Map>(); break;
case 9: m.map_normal = cs.getData<Map>(); break;
case 10: m.map_relief = cs.getData<Map>(); break;
case 11: m.map_specular = cs.getData<Map>(); break;
case 12: m.map_specularity = cs.getData<Map>(); break;
case 13: m.map_self_illumination = cs.getData<Map>(); break;
}
}
return s;