From 9b762849e751924fd379df012ddc667333e331f1 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 2 Feb 2016 00:31:05 -0800 Subject: [PATCH 1/4] InformationCenter stubs --- Editor/CMakeLists.txt | 2 + Editor/Camera.hpp | 11 ++---- Editor/InformationCenter.cpp | 5 +++ Editor/InformationCenter.hpp | 73 ++++++++++++++++++++++++++++++++++++ Editor/ModelViewer.hpp | 24 ++++++++---- Editor/Space.cpp | 10 ++++- Editor/Space.hpp | 3 +- Editor/icons/icons.cpp | 2 + Editor/icons/icons.hpp | 1 + libSpecter | 2 +- 10 files changed, 115 insertions(+), 18 deletions(-) create mode 100644 Editor/InformationCenter.cpp create mode 100644 Editor/InformationCenter.hpp diff --git a/Editor/CMakeLists.txt b/Editor/CMakeLists.txt index c289bafb9..dd8f6625c 100644 --- a/Editor/CMakeLists.txt +++ b/Editor/CMakeLists.txt @@ -20,6 +20,7 @@ atdna(atdna_Space.cpp Space.hpp) atdna(atdna_ResourceBrowser.cpp ResourceBrowser.hpp) atdna(atdna_ModelViewer.cpp ModelViewer.hpp) atdna(atdna_ParticleEditor.cpp ParticleEditor.hpp) +atdna(atdna_InformationCenter.cpp InformationCenter.hpp) if(WIN32) set(PLAT_SRCS platforms/win/urde.rc) @@ -40,6 +41,7 @@ add_executable(urde WIN32 MACOSX_BUNDLE ResourceBrowser.hpp ResourceBrowser.cpp atdna_ResourceBrowser.cpp ModelViewer.hpp ModelViewer.cpp atdna_ModelViewer.cpp ParticleEditor.hpp ParticleEditor.cpp atdna_ParticleEditor.cpp + InformationCenter.hpp InformationCenter.hpp atdna_InformationCenter.cpp ProjectManager.hpp ProjectManager.cpp ViewManager.hpp ViewManager.cpp Resource.hpp Resource.cpp diff --git a/Editor/Camera.hpp b/Editor/Camera.hpp index ef710ec46..6cf947aaa 100644 --- a/Editor/Camera.hpp +++ b/Editor/Camera.hpp @@ -16,19 +16,14 @@ class Camera Zeus::CQuaternion m_orientation; public: - Camera(const Zeus::CVector3f& position, Zeus::EProjType projType=Zeus::EProjType::Perspective, - const Zeus::CVector3f& up=Zeus::Math::kUpVec) - : m_position(position) - { - } + void setPosition(const Zeus::CVector3f& position) { m_position = position; } + void setOrientation(const Zeus::CQuaternion& orientation) { m_orientation = orientation; } const Zeus::CMatrix4f& projectionMatrix() const { return m_projection.getCachedMatrix(); } const Zeus::CProjection& projection() const { return m_projection; } virtual void think() - { - - } + {} }; } diff --git a/Editor/InformationCenter.cpp b/Editor/InformationCenter.cpp new file mode 100644 index 000000000..baea5b7b3 --- /dev/null +++ b/Editor/InformationCenter.cpp @@ -0,0 +1,5 @@ +#include "InformationCenter.hpp" + +namespace URDE +{ +} diff --git a/Editor/InformationCenter.hpp b/Editor/InformationCenter.hpp new file mode 100644 index 000000000..f15e735c8 --- /dev/null +++ b/Editor/InformationCenter.hpp @@ -0,0 +1,73 @@ +#ifndef INFORMATIONCENTER_HPP +#define INFORMATIONCENTER_HPP + +#include "Space.hpp" +#include "ViewManager.hpp" + +namespace URDE +{ +class InformationCenter : public ViewerSpace +{ + struct State : Space::State + { + DECL_YAML + Value showLog; + } m_state; + + const Space::State& spaceState() const { return m_state; } + + struct View : Specter::View + { + InformationCenter& m_ic; + std::vector m_log; + + View(InformationCenter& ic, Specter::ViewResources& res) + : Specter::View(res, ic.m_vm.rootView()), m_ic(ic) + { + commitResources(res); + } + }; + + std::unique_ptr m_view; + +public: + InformationCenter(ViewManager& vm, Space* parent) + : ViewerSpace(vm, Class::InformationCenter, parent) + { + reloadState(); + } + + InformationCenter(ViewManager& vm, Space* parent, const InformationCenter& other) + : InformationCenter(vm, parent) + { + m_state = other.m_state; + reloadState(); + } + + InformationCenter(ViewManager& vm, Space* parent, ConfigReader& r) + : InformationCenter(vm, parent) + { + m_state.read(r); + reloadState(); + } + + void reloadState() + { + } + + virtual Specter::View* buildContentView(Specter::ViewResources& res) + { + m_view.reset(new View(*this, res)); + return m_view.get(); + } + + Space* copy(Space *parent) const + { + return new InformationCenter(m_vm, parent, *this); + } + + bool usesToolbar() const { return true; } +}; +} + +#endif // INFORMATIONCENTER_HPP diff --git a/Editor/ModelViewer.hpp b/Editor/ModelViewer.hpp index 8a8ec5c14..33f035e5d 100644 --- a/Editor/ModelViewer.hpp +++ b/Editor/ModelViewer.hpp @@ -3,8 +3,7 @@ #include "Space.hpp" #include "ViewManager.hpp" -#include "CVector3f.hpp" -#include "CProjection.hpp" +#include "Camera.hpp" namespace URDE { @@ -30,12 +29,14 @@ class ModelViewer : public ViewerSpace struct View : Specter::View { + ModelViewer& m_mv; + View(ModelViewer& mv, Specter::ViewResources& res) + : Specter::View(res, mv.m_vm.rootView()), m_mv(mv) + {} }; - virtual Specter::View* buildContentView(Specter::ViewResources& res) - { - return nullptr; - } + Camera m_camera; + std::unique_ptr m_view; public: ModelViewer(ViewManager& vm, Space* parent) @@ -59,13 +60,22 @@ public: } void reloadState() - {} + { + m_camera.setPosition(m_state.cameraPosition); + m_camera.setOrientation(m_state.cameraOrientation); + } Space* copy(Space *parent) const { return new ModelViewer(m_vm, parent, *this); } + virtual Specter::View* buildContentView(Specter::ViewResources& res) + { + m_view.reset(new View(*this, res)); + return m_view.get(); + } + bool usesToolbar() const { return true; } }; diff --git a/Editor/Space.cpp b/Editor/Space.cpp index f1d58f9f6..73c5044c5 100644 --- a/Editor/Space.cpp +++ b/Editor/Space.cpp @@ -2,6 +2,8 @@ #include "ViewManager.hpp" #include "ResourceBrowser.hpp" #include "ParticleEditor.hpp" +#include "ModelViewer.hpp" +#include "InformationCenter.hpp" #include "icons/icons.hpp" namespace URDE @@ -42,7 +44,9 @@ Specter::View* Space::buildSpaceView(Specter::ViewResources& res) std::vector Space::SpaceMenuNode::s_subNodeDats = { {Class::ResourceBrowser, "resource_browser", "Resource Browser", GetIcon(SpaceIcon::ResourceBrowser), {0.0,1.0,0.0,1.0}}, - {Class::EffectEditor, "effect_editor", "Effect Editor", GetIcon(SpaceIcon::ParticleEditor), {1.0,0.5,0.0,1.0}} + {Class::EffectEditor, "effect_editor", "Effect Editor", GetIcon(SpaceIcon::ParticleEditor), {1.0,0.5,0.0,1.0}}, + {Class::ModelViewer, "model_viewer", "Model Viewer", GetIcon(SpaceIcon::ModelViewer), {0.5, 0.5, 0.0, 1.0}}, + {Class::InformationCenter, "information_center", "Information Center", GetIcon(SpaceIcon::InformationCenter), {0.0, 1.0, 1.0, 1.0}} }; std::string Space::SpaceMenuNode::s_text = "Space Types"; @@ -199,6 +203,10 @@ static Space* BuildNewSpace(ViewManager& vm, Space::Class cls, Space* parent, Re return new ResourceBrowser(vm, parent, r); case Class::EffectEditor: return new EffectEditor(vm, parent, r); + case Class::ModelViewer: + return new ModelViewer(vm, parent, r); + case Class::InformationCenter: + return new InformationCenter(vm, parent, r); default: break; } return nullptr; diff --git a/Editor/Space.hpp b/Editor/Space.hpp index 83d3908fb..93031a403 100644 --- a/Editor/Space.hpp +++ b/Editor/Space.hpp @@ -34,7 +34,8 @@ public: TestSpace, ResourceBrowser, ModelViewer, - EffectEditor + EffectEditor, + InformationCenter }; struct State : Athena::io::DNAYaml {Delete _d;}; diff --git a/Editor/icons/icons.cpp b/Editor/icons/icons.cpp index 30437fe84..d452cc26b 100644 --- a/Editor/icons/icons.cpp +++ b/Editor/icons/icons.cpp @@ -45,6 +45,8 @@ Specter::Icon& GetIcon(SpaceIcon icon) return g_IconAtlas.getIcon(0, 2); case SpaceIcon::InformationCenter: return g_IconAtlas.getIcon(0, 3); + case SpaceIcon::ModelViewer: + return g_IconAtlas.getIcon(0, 4); } } diff --git a/Editor/icons/icons.hpp b/Editor/icons/icons.hpp index bb7211337..023344f16 100644 --- a/Editor/icons/icons.hpp +++ b/Editor/icons/icons.hpp @@ -13,6 +13,7 @@ enum class SpaceIcon ResourceBrowser, ParticleEditor, WorldEditor, + ModelViewer, InformationCenter }; Specter::Icon& GetIcon(SpaceIcon icon); diff --git a/libSpecter b/libSpecter index 2adc2f1c6..8ab78bf19 160000 --- a/libSpecter +++ b/libSpecter @@ -1 +1 @@ -Subproject commit 2adc2f1c6c0b6770955fcf46ab1bba2ac091ac23 +Subproject commit 8ab78bf19dcaa322700eb03a201942c43d38ac91 From 9649acb829d10e2e5a23ec829d21036d2e5812ec Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 2 Feb 2016 01:16:07 -0800 Subject: [PATCH 2/4] More GPSM element offsets --- DataSpec/DNACommon/PART.hpp | 56 +++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) diff --git a/DataSpec/DNACommon/PART.hpp b/DataSpec/DNACommon/PART.hpp index f88299cb8..14babe18e 100644 --- a/DataSpec/DNACommon/PART.hpp +++ b/DataSpec/DNACommon/PART.hpp @@ -14,7 +14,29 @@ struct GPSM : BigYAML static const char* DNAType() {return "Retro::GPSM";} const char* DNATypeV() const {return DNAType();} + VectorElement x18_POFS; + RealElement x20_LENG; + RealElement x24_WIDT; + IntElement x28_MAXP; + ColorElement x30_COLR; + IntElement x34_LTME; + VectorElement x38_ILOC; + VectorElement x3c_IVEC; + EmitterElement x40_EMTR; + atUint8 x44_settings; // SORT,MBLR,LINE + atUint8 x45_options; // VMD1-4, OPTS + RealElement x4c_SIZE; + RealElement x50_ROTA; + TextureElement x54_TEXR; + TextureElement x58_TIND; + IntElement xb4_NDSY; + VectorElement x110_LDIR; + ColorElement x104_LCLR; + RealElement x108_LINT; + VectorElement x10c_LOFF; + IntElement x114_LFOT; RealElement x118_LFOR; + RealElement x11c_LSLA; ChildGeneratorDesc xa4_IDTS; void read(Athena::io::YAMLDocReader& r) @@ -31,11 +53,12 @@ struct GPSM : BigYAML } if (r.enterSubRecord("EMTR")) { - + x40_EMTR.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("COLR")) { + x30_COLR.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("CIND")) @@ -72,6 +95,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("ILOC")) { + x38_ILOC.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("IITS")) @@ -80,10 +104,12 @@ struct GPSM : BigYAML } if (r.enterSubRecord("IVEC")) { + x3c_IVEC.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("LDIR")) { + x110_LDIR.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("COLR")) @@ -92,18 +118,22 @@ struct GPSM : BigYAML } if (r.enterSubRecord("LCLR")) { + x104_LCLR.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("LENG")) { + x20_LENG.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("MAXP")) { + x28_MAXP.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("LOFF")) { + x10c_LOFF.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("LINT")) @@ -116,6 +146,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("LFOT")) { + x114_LFOT.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("LIT_")) @@ -124,10 +155,12 @@ struct GPSM : BigYAML } if (r.enterSubRecord("LTME")) { + x34_LTME.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("LSLA")) { + x11c_LSLA.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("LTYP")) @@ -136,6 +169,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("NDSY")) { + xb4_NDSY.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("MBSP")) @@ -192,6 +226,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("POFS")) { + x18_POFS.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("PMUS")) @@ -204,6 +239,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("ROTA")) { + x50_ROTA.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("PSVM")) @@ -248,6 +284,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("SIZE")) { + x4c_SIZE.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("SISY")) @@ -260,6 +297,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("TEXR")) { + x54_TEXR.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("SSWH")) @@ -268,12 +306,21 @@ struct GPSM : BigYAML } if (r.enterSubRecord("TIND")) { + x58_TIND.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("VMD4")) { r.leaveSubRecord(); } + if (r.enterSubRecord("VMD3")) + { + r.leaveSubRecord(); + } + if (r.enterSubRecord("VMD2")) + { + r.leaveSubRecord(); + } if (r.enterSubRecord("VMD1")) { r.leaveSubRecord(); @@ -286,7 +333,11 @@ struct GPSM : BigYAML { r.leaveSubRecord(); } - if (r.enterSubRecord("VMD3")) + if (r.enterSubRecord("VEL2")) + { + r.leaveSubRecord(); + } + if (r.enterSubRecord("VEL1")) { r.leaveSubRecord(); } @@ -296,6 +347,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("WIDT")) { + x24_WIDT.read(r); r.leaveSubRecord(); } } From 5d5bd53db88ffe19e58faf9c1d21033d80dedf90 Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 2 Feb 2016 11:11:17 -0800 Subject: [PATCH 3/4] More element types --- DataSpec/DNACommon/PART.hpp | 113 +++++++++++++++++++++++++----------- 1 file changed, 79 insertions(+), 34 deletions(-) diff --git a/DataSpec/DNACommon/PART.hpp b/DataSpec/DNACommon/PART.hpp index 14babe18e..36d5a186f 100644 --- a/DataSpec/DNACommon/PART.hpp +++ b/DataSpec/DNACommon/PART.hpp @@ -14,33 +14,58 @@ struct GPSM : BigYAML static const char* DNAType() {return "Retro::GPSM";} const char* DNATypeV() const {return DNAType();} - VectorElement x18_POFS; - RealElement x20_LENG; - RealElement x24_WIDT; - IntElement x28_MAXP; - ColorElement x30_COLR; - IntElement x34_LTME; - VectorElement x38_ILOC; - VectorElement x3c_IVEC; - EmitterElement x40_EMTR; - atUint8 x44_settings; // SORT,MBLR,LINE - atUint8 x45_options; // VMD1-4, OPTS - RealElement x4c_SIZE; - RealElement x50_ROTA; - TextureElement x54_TEXR; - TextureElement x58_TIND; - IntElement xb4_NDSY; - VectorElement x110_LDIR; - ColorElement x104_LCLR; - RealElement x108_LINT; - VectorElement x10c_LOFF; - IntElement x114_LFOT; - RealElement x118_LFOR; - RealElement x11c_LSLA; + + VectorElementFactory x18_POFS; + IntElementFactory x1c_PMED; + RealElementFactory x20_LENG; + RealElementFactory x24_WIDT; + IntElementFactory x28_MAXP; + RealElementFactory x2c_GRTE; + ColorElementFactory x30_COLR; + IntElementFactory x34_LTME; + VectorElementFactory x38_ILOC; + VectorElementFactory x3c_IVEC; + //EmitterElementFactory x40_EMTR; + bool x44_0_SORT : 1; bool x44_1_MBLR : 1; bool x44_2_LINE : 1; bool x44_3_LIT_ : 1; + bool x44_4_AAPH : 1; bool x44_5_ZBUF : 1; bool x44_6_FXLL : 1; bool x44_7_PMAB : 1; + bool x45_0_VMD4 : 1; bool x45_1_VMD3 : 1; bool x45_2_VMD2 : 1; bool x45_3_VMD1 : 1; + bool x45_4_OPTS : 1; bool x45_5_PMUS : 1; bool x45_6_PMOO : 1; // is the last bit unused? + IntElementFactory x48_MBSP; + RealElementFactory x4c_SIZE; + RealElementFactory x50_ROTA; + //TextureElementFactory x54_TEXR; + //TextureElementFactory x58_TIND; + // x5c_PMDL Model + VectorElementFactory x6c_PMOP; + VectorElementFactory x70_PMRT; + VectorElementFactory x74_PMSC; + ColorElementFactory x78_PMCL; + ChildGeneratorDesc x8c_ICTS; + IntElementFactory x9c_NCSY; + IntElementFactory xb4_NDSY; + IntElementFactory xa0_CSSD; ChildGeneratorDesc xa4_IDTS; + IntElementFactory xc8_PISY; + IntElementFactory xcc_SISY; + IntElementFactory xe4_SSSD; + VectorElementFactory xe8_SSPO; + // xec_PMLC Electric Generator + IntElementFactory x100_LTYP; + ColorElementFactory x104_LCLR; + RealElementFactory x108_LINT; + VectorElementFactory x110_LDIR; + VectorElementFactory x10c_LOFF; + IntElementFactory x114_LFOT; + RealElementFactory x118_LFOR; + RealElementFactory x11c_LSLA; void read(Athena::io::YAMLDocReader& r) { + if (r.enterSubRecord("PMCL")) + { + x78_PMCL.read(r); + r.leaveSubRecord(); + } if (r.enterSubRecord("LFOR")) { x118_LFOR.read(r); @@ -53,7 +78,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("EMTR")) { - x40_EMTR.read(r); + //x40_EMTR.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("COLR")) @@ -67,18 +92,17 @@ struct GPSM : BigYAML } if (r.enterSubRecord("AAPH")) { + x44_4_AAPH = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("CSSD")) { + xa0_CSSD.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("GRTE")) { - r.leaveSubRecord(); - } - if (r.enterSubRecord("COLR")) - { + x2c_GRTE.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("FXLL")) @@ -87,6 +111,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("ICTS")) { + x8c_ICTS.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("KSSM")) @@ -142,6 +167,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("LINE")) { + x44_2_LINE = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("LFOT")) @@ -151,6 +177,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("LIT_")) { + x44_3_LIT_ = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("LTME")) @@ -165,6 +192,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("LTYP")) { + x100_LTYP.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("NDSY")) @@ -174,26 +202,32 @@ struct GPSM : BigYAML } if (r.enterSubRecord("MBSP")) { + x48_MBSP.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("MBLR")) { + x44_1_MBLR = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("NCSY")) { + x9c_NCSY.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("PISY")) { + xc8_PISY.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("OPTS")) { + x45_4_OPTS = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("PMAB")) { + x44_7_PMAB = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("SESD")) @@ -206,10 +240,12 @@ struct GPSM : BigYAML } if (r.enterSubRecord("PMSC")) { + x74_PMSC.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("PMOP")) { + x6c_PMOP.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("PMDL")) @@ -222,6 +258,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("PMRT")) { + x70_PMRT.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("POFS")) @@ -231,6 +268,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("PMUS")) { + x45_5_PMUS = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("PSIV")) @@ -264,22 +302,22 @@ struct GPSM : BigYAML } if (r.enterSubRecord("PMED")) { + x1c_PMED.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("PMOO")) { - r.leaveSubRecord(); - } - if (r.enterSubRecord("VEL1")) - { + x45_6_PMOO = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("SSSD")) { + xe4_SSSD.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("SORT")) { + x44_0_SORT = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("SIZE")) @@ -289,15 +327,17 @@ struct GPSM : BigYAML } if (r.enterSubRecord("SISY")) { + xcc_SISY.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("SSPO")) { + xe8_SSPO.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("TEXR")) { - x54_TEXR.read(r); + //x54_TEXR.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("SSWH")) @@ -306,23 +346,27 @@ struct GPSM : BigYAML } if (r.enterSubRecord("TIND")) { - x58_TIND.read(r); + //x58_TIND.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("VMD4")) { + x45_0_VMD4 = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("VMD3")) { + x45_1_VMD3 = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("VMD2")) { + x45_2_VMD2 = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("VMD1")) { + x45_3_VMD1 = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("VEL4")) @@ -343,6 +387,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("ZBUF")) { + x44_5_ZBUF = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("WIDT")) From ee6937ad0a9123d6b6ed47b04f1a15197d97192c Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 2 Feb 2016 12:05:31 -0800 Subject: [PATCH 4/4] Add ModelViewer WIP icon --- Editor/icons/icons.svg | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/Editor/icons/icons.svg b/Editor/icons/icons.svg index c38034073..afba1925c 100644 --- a/Editor/icons/icons.svg +++ b/Editor/icons/icons.svg @@ -25,17 +25,17 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="19.709914" - inkscape:cx="39.011614" - inkscape:cy="31.253837" + inkscape:zoom="39.419828" + inkscape:cx="8.6860061" + inkscape:cy="66.261622" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" units="px" - inkscape:window-width="2560" - inkscape:window-height="1391" + inkscape:window-width="1366" + inkscape:window-height="713" inkscape:window-x="0" - inkscape:window-y="1" + inkscape:window-y="31" inkscape:window-maximized="1"> + + + + + +