Browse Source

Fix for assemblyFile references

Josh Engebretson 9 years ago
parent
commit
da6fc9f055

+ 1 - 1
Script/AtomicEditor/ui/frames/inspector/CSComponentClassSelector.ts

@@ -28,7 +28,7 @@ class CSComponentClassSelector extends Atomic.UIWindow {
 
 
         super();
         super();
 
 
-        var assemblyFile = component.assemblyFile;
+        var assemblyFile = component.componentFile;
 
 
         this.text = "Select Class: " + assemblyFile.name;
         this.text = "Select Class: " + assemblyFile.name;
 
 

+ 1 - 1
Script/AtomicEditor/ui/frames/inspector/SelectionEditTypes.ts

@@ -64,7 +64,7 @@ class CSComponentEditType extends SerializableEditType {
         var csc1 = <AtomicNETScript.CSComponent>(otherType.objects[0]);
         var csc1 = <AtomicNETScript.CSComponent>(otherType.objects[0]);
         var csc2 = <AtomicNETScript.CSComponent>(this.objects[0]);
         var csc2 = <AtomicNETScript.CSComponent>(this.objects[0]);
 
 
-        return csc1.assemblyFile == csc2.assemblyFile && csc1.componentClassName == csc2.componentClassName;
+        return csc1.componentFile == csc2.componentFile && csc1.componentClassName == csc2.componentClassName;
 
 
     }
     }
 
 

+ 5 - 0
Source/Atomic/Script/ScriptComponentFile.h

@@ -40,6 +40,8 @@ public:
 
 
     static void RegisterObject(Context* context);
     static void RegisterObject(Context* context);
 
 
+    /// Only valid in editor, as we don't inspect classnames at runtime
+    virtual const Vector<String>& GetClassNames() { return classNames_; }
     const EnumMap& GetEnums(const String& classname = String::EMPTY) const;
     const EnumMap& GetEnums(const String& classname = String::EMPTY) const;
     const FieldMap& GetFields(const String& classname = String::EMPTY) const;
     const FieldMap& GetFields(const String& classname = String::EMPTY) const;
     const VariantMap& GetDefaultFieldValues(const String& classname = String::EMPTY) const;
     const VariantMap& GetDefaultFieldValues(const String& classname = String::EMPTY) const;
@@ -54,6 +56,9 @@ protected:
     void AddField(const String& fieldName, VariantType variantType, const String& classname = String::EMPTY);
     void AddField(const String& fieldName, VariantType variantType, const String& classname = String::EMPTY);
     void AddDefaultValue(const String& fieldName, const Variant& value, const String& classname = String::EMPTY);
     void AddDefaultValue(const String& fieldName, const Variant& value, const String& classname = String::EMPTY);
 
 
+    // only valid in editor
+    Vector<String> classNames_;
+
 private:
 private:
 
 
     ClassFieldMap classFields_;
     ClassFieldMap classFields_;

+ 0 - 3
Source/AtomicNET/NETScript/CSComponentAssembly.h

@@ -78,9 +78,6 @@ namespace Atomic
 
 
         String fullAssemblyPath_;
         String fullAssemblyPath_;
 
 
-        // only valid in editor
-        Vector<String> classNames_;
-
         HashMap<String, Vector<EnumInfo>> assemblyEnums_;
         HashMap<String, Vector<EnumInfo>> assemblyEnums_;
         static HashMap<StringHash, VariantType> typeMap_;
         static HashMap<StringHash, VariantType> typeMap_;