/[Sims3RigEditor]/trunk/gr2lib_cpp/gr2lib_rigeditor_frm.h
ViewVC logotype

Diff of /trunk/gr2lib_cpp/gr2lib_rigeditor_frm.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 84 by william, Sat Aug 14 20:21:40 2010 UTC revision 88 by william, Sun Aug 15 00:51:50 2010 UTC
# Line 107  public: Line 107  public:
107    
108                  this->GR2LibPropertyWrapper = gcnew GR2LibWrapper();                  this->GR2LibPropertyWrapper = gcnew GR2LibWrapper();
109                  ConvertToManaged();                  ConvertToManaged();
110                  propgrid->SelectedObject = this->GR2LibPropertyWrapper;                  propgrid->SelectedObject = this->GR2LibPropertyWrapper->GetPropertiesValidForThisInstance();
                 this->GR2LibPropertyWrapper->HideNonSelectableObjects(this->propgrid);  
111          }          }
112    
113  protected:  protected:
# Line 423  private: Line 422  private:
422                                          ::coreapi::EnumToStringSupport::GetGrannyEnumTypeString<gr2lib::core::typedefs::granny_pixel_layout>(                                          ::coreapi::EnumToStringSupport::GetGrannyEnumTypeString<gr2lib::core::typedefs::granny_pixel_layout>(
423                                          (gr2lib::core::typedefs::granny_pixel_layout)toolinfo[i]->SubFormat),                                          (gr2lib::core::typedefs::granny_pixel_layout)toolinfo[i]->SubFormat),
424                                          (gr2lib::core::typedefs::granny_pixel_layout)toolinfo[i]->SubFormat);                                          (gr2lib::core::typedefs::granny_pixel_layout)toolinfo[i]->SubFormat);
425    
426                                    //t->Layout = gr2lib::core::typedefs::granny_pixel_layouts::GetPixelLayoutFromEnum(t->SubFormat->Value);
427    
428                                  t->Layout = gcnew gr2lib::core::coretypes::implementation::Layout();                                  t->Layout = gcnew gr2lib::core::coretypes::implementation::Layout();
429                                  t->Layout->BytesPerPixel = toolinfo[i]->Layout.BytesPerPixel;                                  t->Layout->BytesPerPixel = toolinfo[i]->Layout.BytesPerPixel;
430                                  for(int j=0;j<granny_pixel_layout_bitshift_size;j++)                                  for(int j=0;j<granny_pixel_layout_bitshift_size;j++)
# Line 682  private: Line 684  private:
684                                  _grn_file->GrannyFileInfo->Textures[i]->ExtendedData = ExtendedData_ToNative(GR2LibPropertyWrapper->Textures[i]->ExtendedData,_grn_file->GrannyFileInfo->Textures[i]->ExtendedData);                                  _grn_file->GrannyFileInfo->Textures[i]->ExtendedData = ExtendedData_ToNative(GR2LibPropertyWrapper->Textures[i]->ExtendedData,_grn_file->GrannyFileInfo->Textures[i]->ExtendedData);
685                          }                          }
686                  }                  }
   
687          }          }
688  #pragma endregion  #pragma endregion
689  #pragma region Materials_ToNative  #pragma region Materials_ToNative
# Line 869  private: System::Void mnuItemOpen_Click( Line 870  private: System::Void mnuItemOpen_Click(
870    
871                           this->GR2LibPropertyWrapper = gcnew GR2LibWrapper();                           this->GR2LibPropertyWrapper = gcnew GR2LibWrapper();
872                           ConvertToManaged();                           ConvertToManaged();
873                           propgrid->SelectedObject = this->GR2LibPropertyWrapper;                           propgrid->SelectedObject = this->GR2LibPropertyWrapper->GetPropertiesValidForThisInstance();
                          this->GR2LibPropertyWrapper->HideNonSelectableObjects(this->propgrid);  
874                   }                   }
875  private: System::Void gr2lib_rigeditor_frm_FormClosed(System::Object^  sender, System::Windows::Forms::FormClosedEventArgs^  e)  private: System::Void gr2lib_rigeditor_frm_FormClosed(System::Object^  sender, System::Windows::Forms::FormClosedEventArgs^  e)
876                   {                   {

Legend:
Removed from v.84  
changed lines
  Added in v.88

  ViewVC Help
Powered by ViewVC 1.1.22