Subject | Hash | Author | Date (UTC) |
---|---|---|---|
more lost changes | c52ad1ddc9fe753cb2ec6f388e4a88f9dfb0fadf | Jackalope | 2020-05-24 13:30:51 |
added lost changes | 1e60b3d0d8ecda7995f3a102257d8f3c0ca4b15e | Jackalope | 2020-05-24 13:27:42 |
CMake installation target | 57ba69a5bc17124a96b401c20e68f1602345c4f7 | Jackalope | 2020-05-24 13:22:15 |
Moved read,write functions to read.h,write.h, merged vertices,indices and mesh files to mesh.h | 365bcb01b01e95448e223de82e9f9e96b51fa789 | Jackalope | 2020-05-24 13:21:23 |
Update for new JLIB target | a1152ffa6340863fbbd216a4d38806e2d31d3dd5 | Jackalope | 2020-05-23 23:27:05 |
added CMake project PARENT_SCOPE variables JRF_* | 5ac8009d6709f681fbe0d59dba8cdd646a3cdc47 | Jackalope | 2020-05-20 19:06:51 |
added version number definitions, changed magic number (because incompatible) | 46ccce5359274d660b327c667903b9534dc3bfe0 | Jackalope | 2020-05-19 17:39:57 |
Changed image formats, BGR->RGB convertion while reading from TARGA | 297dd913b6084e890e5bd3d53f88d06a8f14657a | Jackalope | 2020-05-19 17:17:53 |
Changed cmake library interface | 9c704c515769a03e5b1f82dcb1fd947884f1bd1e | Jackalope | 2020-05-12 06:58:47 |
added copyright notice to convert.cpp and convert.h | a778f4f4a4783656fefac85440e135ddcda3788c | Jackalope | 2020-05-12 05:18:35 |
fixes after prev commit changes | fc46b4bacf1c69f6eae0c679b26e3b88d1796217 | Jackalope | 2020-05-11 08:14:50 |
convert image from tga and add alpha channel functions | 4541972149b6b19afda05c608d4abe88a72098bb | Jackalope | 2020-05-11 07:49:43 |
more image formats | 77bf7ec016cfb604e4a8e06734a4eb71bb299df0 | Jackalope | 2020-05-11 07:48:46 |
added license | d7c63a0b6199c7f5c1680559953eef1699ec9a48 | Jackalope | 2020-05-10 01:01:00 |
refactoring | 66f541c32f51d6ed6f90fba1f3b58561726e8659 | Jackalope | 2020-05-10 00:55:34 |
extra vertices check | c3bd2141d2eaeb96beb5c8ad29e3333c015db4c8 | jp.larry | 2019-12-26 14:38:29 |
removed dead code | f4ddde689122f1b96fda5292e69f612bf2ca327d | jp.larry | 2019-12-26 14:38:06 |
removed forgotten vertex data_size writing | 25244188b395b6cca35502f4156d3e78cc1e74ec | jp.larry | 2019-12-26 13:19:31 |
better read errors | d6d7bc5df695d694ea0dee225905212ef1dfe41b | jp.larry | 2019-12-26 13:18:55 |
changed vertices file structure to prevent undefined behaviour | 603e283ccf234f87f6e8c38a669280be36a5aafb | jp.larry | 2019-12-26 12:35:05 |
File | Lines added | Lines deleted |
---|---|---|
include/jrf/write.h | 4 | 4 |
File include/jrf/write.h changed (mode: 100644) (index 375ed8d..f667f9e) | |||
... | ... | namespace jrf | |
50 | 50 | return Result::MEDIATOR_ERROR; | return Result::MEDIATOR_ERROR; |
51 | 51 | switch(d.mode) { | switch(d.mode) { |
52 | 52 | case ResourceMode::DATA: { | case ResourceMode::DATA: { |
53 | Result res = d.u.data.write(p_io); | ||
53 | Result res = write(d.u.data, p_io); | ||
54 | 54 | if (res != Result::SUCCESS) | if (res != Result::SUCCESS) |
55 | 55 | return res; | return res; |
56 | 56 | } break; | } break; |
... | ... | namespace jrf | |
83 | 83 | } | } |
84 | 84 | template<typename IO = jl::io_agent> [[nodiscard]] | template<typename IO = jl::io_agent> [[nodiscard]] |
85 | 85 | Result write(const Model &m, IO *p_io) { | Result write(const Model &m, IO *p_io) { |
86 | Result res = write(&m.mesh, p_io); | ||
86 | Result res = write(m.mesh, p_io); | ||
87 | 87 | if (res != Result::SUCCESS) | if (res != Result::SUCCESS) |
88 | 88 | return res; | return res; |
89 | return write(&m.image, p_io); | ||
89 | return write(m.image, p_io); | ||
90 | 90 | } | } |
91 | 91 | template<typename IO = jl::io_agent> [[nodiscard]] | template<typename IO = jl::io_agent> [[nodiscard]] |
92 | 92 | Result write(const SceneEntry &s, IO *p_mediator) { | Result write(const SceneEntry &s, IO *p_mediator) { |
... | ... | namespace jrf | |
113 | 113 | if (not p_io->write_items(&entry_count)) | if (not p_io->write_items(&entry_count)) |
114 | 114 | return Result::MEDIATOR_ERROR; | return Result::MEDIATOR_ERROR; |
115 | 115 | for (auto &e : s.entries) { | for (auto &e : s.entries) { |
116 | Result res = write(&e, p_mediator); | ||
116 | Result res = write(e, p_mediator); | ||
117 | 117 | if (res != Result::SUCCESS) | if (res != Result::SUCCESS) |
118 | 118 | return res; | return res; |
119 | 119 | } | } |