comparison: src/gl/compiler.cpp
src/gl/compiler.cpp
- changeset 78
- 97c3ce5aa498
- parent 73
- 97df974b5ed5
- child 80
- 764381756899
equal
deleted
inserted
replaced
| 77:028798a72591 | 78:97c3ce5aa498 |
|---|---|
| 235 return gl::ArrayClass::ConditionalLines; | 235 return gl::ArrayClass::ConditionalLines; |
| 236 } | 236 } |
| 237 return gl::ArrayClass::Lines; | 237 return gl::ArrayClass::Lines; |
| 238 } | 238 } |
| 239 | 239 |
| 240 ldraw::id_t gl::Compiler::idFromColor(const std::array<GLbyte, 3>& data) | 240 ldraw::id_t gl::Compiler::idFromColor(const std::array<GLubyte, 3>& data) |
| 241 { | 241 { |
| 242 return {data[0] * std::int32_t{0x10000} + data[1] * std::int32_t{0x100} + data[2]}; | 242 return {data[0] * std::int32_t{0x10000} + data[1] * std::int32_t{0x100} + data[2]}; |
| 243 } | 243 } |
| 244 | 244 |
| 245 void gl::Compiler::buildPolygon( | 245 void gl::Compiler::buildPolygon( |
