From b8b267db73bbaecf422491e44aedf206a35e237b Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Tue, 2 Feb 2016 14:35:17 -0800 Subject: [PATCH] More element offsets Adjust color Adjust icon --- DataSpec/DNACommon/PART.hpp | 30 ++++++++++++++++++++---------- Editor/Space.cpp | 2 +- Editor/icons/icons.svg | 10 +++++----- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/DataSpec/DNACommon/PART.hpp b/DataSpec/DNACommon/PART.hpp index 36d5a186f..303f35d3d 100644 --- a/DataSpec/DNACommon/PART.hpp +++ b/DataSpec/DNACommon/PART.hpp @@ -29,17 +29,21 @@ struct GPSM : BigYAML 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? + bool x45_4_OPTS : 1; bool x45_5_PMUS : 1; bool x45_6_PMOO : 1; bool x45_7_CIND : 1; IntElementFactory x48_MBSP; RealElementFactory x4c_SIZE; RealElementFactory x50_ROTA; - //TextureElementFactory x54_TEXR; - //TextureElementFactory x58_TIND; + UVElementFactory x54_TEXR; + UVElementFactory x58_TIND; // x5c_PMDL Model VectorElementFactory x6c_PMOP; VectorElementFactory x70_PMRT; VectorElementFactory x74_PMSC; ColorElementFactory x78_PMCL; + ModVectorElementFactory x7c_VEL1; + ModVectorElementFactory x80_VEL2; + ModVectorElementFactory x84_VEL3; + ModVectorElementFactory x88_VEL4; ChildGeneratorDesc x8c_ICTS; IntElementFactory x9c_NCSY; IntElementFactory xb4_NDSY; @@ -47,14 +51,15 @@ struct GPSM : BigYAML ChildGeneratorDesc xa4_IDTS; IntElementFactory xc8_PISY; IntElementFactory xcc_SISY; + // xd4_SSWH Swoosh 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; + VectorElementFactory x110_LDIR; IntElementFactory x114_LFOT; RealElementFactory x118_LFOR; RealElementFactory x11c_LSLA; @@ -88,6 +93,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("CIND")) { + x45_7_CIND = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("AAPH")) @@ -107,6 +113,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("FXLL")) { + x44_6_FXLL = r.readBool(nullptr); r.leaveSubRecord(); } if (r.enterSubRecord("ICTS")) @@ -163,6 +170,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("LINT")) { + x108_LINT.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("LINE")) @@ -250,10 +258,7 @@ struct GPSM : BigYAML } if (r.enterSubRecord("PMDL")) { - r.leaveSubRecord(); - } - if (r.enterSubRecord("PMOO")) - { + // x5c_PMDL.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("PMRT")) @@ -337,16 +342,17 @@ struct GPSM : BigYAML } if (r.enterSubRecord("TEXR")) { - //x54_TEXR.read(r); + x54_TEXR.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("SSWH")) { + // xd4_SSWH.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("TIND")) { - //x58_TIND.read(r); + x58_TIND.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("VMD4")) @@ -371,18 +377,22 @@ struct GPSM : BigYAML } if (r.enterSubRecord("VEL4")) { + x88_VEL4.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("VEL3")) { + x84_VEL3.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("VEL2")) { + x80_VEL2.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("VEL1")) { + x7c_VEL1.read(r); r.leaveSubRecord(); } if (r.enterSubRecord("ZBUF")) diff --git a/Editor/Space.cpp b/Editor/Space.cpp index 73c5044c5..074785aad 100644 --- a/Editor/Space.cpp +++ b/Editor/Space.cpp @@ -45,7 +45,7 @@ std::vector Space::SpaceMenuNode::s_subNodeDa { {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::ModelViewer, "model_viewer", "Model Viewer", GetIcon(SpaceIcon::ModelViewer), {0.5, 0.5, 0.0, 1.0}}, + {Class::ModelViewer, "model_viewer", "Model Viewer", GetIcon(SpaceIcon::ModelViewer), {0.95, 0.95, 0.95, 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"; diff --git a/Editor/icons/icons.svg b/Editor/icons/icons.svg index afba1925c..7c0f73495 100644 --- a/Editor/icons/icons.svg +++ b/Editor/icons/icons.svg @@ -27,9 +27,9 @@ inkscape:pageshadow="2" inkscape:zoom="39.419828" inkscape:cx="8.6860061" - inkscape:cy="66.261622" + inkscape:cy="72.349928" inkscape:document-units="px" - inkscape:current-layer="layer1" + inkscape:current-layer="g3516" showgrid="true" units="px" inkscape:window-width="1366" @@ -258,7 +258,7 @@ transform="matrix(0.32198959,0,0,0.32198959,-15.18449,670.22212)"> @@ -266,11 +266,11 @@ sodipodi:nodetypes="ccccc" inkscape:connector-curvature="0" id="path2989" - d="m 72,961.36217 0,25 20,-10 0,-25 z" + d="m 72,961.59854 0,25 20,-10 0,-25 z" style="fill:#cbcbcb;fill-opacity:1;stroke:none" />