Working on editable component fields

Build/AtomicNETTest/MyClass.cs

@@ -7,7 +7,7 @@ namespace AtomicNETTest
     public enum BehaviorState
     {
       Friendly,
-      Aggressive = 10,
+      Aggressive,
       Neutral
     }
 
@@ -23,7 +23,7 @@ namespace AtomicNETTest
         public Vector3 MyVector3Value = new Vector3(1, 1, 1);
 
         [Inspector]
-        public Quaternion MyQuaternionValue = new Quaternion(1, 1, 1, 1);
+        public Quaternion MyQuaternionValue = new Quaternion(1, 0, 0, 0);
 
         [Inspector(Value1 = "This is a", Value2 = "test")]
         public float MyFloatValue = 42.0f;

Source/AtomicJS/Javascript/JSSceneSerializable.cpp

@@ -148,7 +148,7 @@ static int Serializable_SetAttribute(duk_context* ctx)
 
                             if (idx > 0 && idx < enums[name]->Size())
                             {
-                                VariantMap& values = jsc->GetFieldValues();
+                                VariantMap& values = csc->GetFieldValues();
                                 values[name] = enums[name]->At(idx).value_;
                                 return 0;
                             }

Source/AtomicNET/NETCore/NETAssemblyFile.cpp

@@ -33,6 +33,20 @@
 namespace Atomic
 {
 
+/*
+
+"enums":[
+      {
+         "name":"BehaviorState",
+         "values":{
+            "Friendly":0,
+            "Aggressive":10,
+            "Neutral":11
+         }
+      }
+   ],
+
+*/
 NETAssemblyFile::NETAssemblyFile(Context* context) :
     Resource(context)
 {
@@ -56,6 +70,33 @@ NETComponentClass* NETAssemblyFile::GetComponentClass(const String& name)
 bool NETAssemblyFile::ParseAssemblyJSON(const JSONValue& json)
 {
     componentClasses_.Clear();
+    enums_.Clear();
+
+    const JSONArray& enums = json.Get("enums").GetArray();
+
+    for (unsigned i = 0; i < enums.Size(); i++)
+    {
+        const JSONValue& ejson = enums.At(i);
+
+        String enumName = ejson.Get("name").GetString();
+
+        const JSONObject& evalues = ejson.Get("values").GetObject();
+
+        JSONObject::ConstIterator itr = evalues.Begin();
+
+        Vector<EnumInfo> values;
+
+        while(itr != evalues.End())
+        {
+            EnumInfo info;
+            info.name_ = itr->first_;
+            info.value_ = itr->second_.GetInt();
+            values.Push(info);
+            itr++;
+        }
+
+        enums_[enumName] = values;
+    }
 
     const JSONArray& components = json.Get("components").GetArray();
 
@@ -63,7 +104,7 @@ bool NETAssemblyFile::ParseAssemblyJSON(const JSONValue& json)
     {
         const JSONValue& cjson = components.At(i);
 
-        SharedPtr<NETComponentClass> c(new NETComponentClass(context_));
+        SharedPtr<NETComponentClass> c(new NETComponentClass(context_, this));
 
         if (c->ParseJSON(cjson))
             componentClasses_[c->GetName()] = c;

Source/AtomicNET/NETCore/NETAssemblyFile.h

@@ -27,6 +27,8 @@
 #include <Atomic/Container/ArrayPtr.h>
 #include <Atomic/Container/List.h>
 
+#include <Atomic/Script/Script.h>
+
 namespace Atomic
 {
 
@@ -47,6 +49,7 @@ public:
 
     bool ParseAssemblyJSON(const JSONValue& json);
 
+    const HashMap<String, Vector<EnumInfo>>& GetEnums() const { return enums_; }
     NETComponentClass* GetComponentClass(const String& name);
 
     /// Load resource from stream. May be called from a worker thread. Return true if successful.
@@ -59,6 +62,7 @@ public:
 
 private:
 
+    HashMap<String, Vector<EnumInfo>> enums_;
     HashMap<StringHash, SharedPtr<NETComponentClass>> componentClasses_;
 
 };

Source/AtomicNET/NETCore/NETComponentClass.cpp

@@ -21,6 +21,7 @@
 //
 
 #include <Atomic/IO/Log.h>
+#include "NETAssemblyFile.h"
 #include "NETComponentClass.h"
 
 /*
@@ -46,8 +47,9 @@ namespace Atomic
 
 HashMap<String, VariantType> NETComponentClass::typeMap_;
 
-NETComponentClass::NETComponentClass(Context* context) :
-    Object(context)
+NETComponentClass::NETComponentClass(Context* context, NETAssemblyFile* assemblyFile) :
+    Object(context),
+    assemblyFile_(assemblyFile)
 {
 
 }
@@ -118,6 +120,10 @@ bool NETComponentClass::ParseJSON(const JSONValue& json)
     if (!typeMap_.Size())
         InitTypeMap();
 
+    const HashMap<String, Vector<EnumInfo>>& fileEnums = assemblyFile_->GetEnums();
+
+    enums_.Clear();
+
     name_ = json.Get("name").GetString();
 
     const JSONValue& jfields = json.Get("fields");
@@ -137,7 +143,26 @@ bool NETComponentClass::ParseJSON(const JSONValue& json)
 
             if (isEnum)
             {
-                varType = typeMap_["Enum"];
+                if (fileEnums.Contains(typeName))
+                {
+                    Vector<EnumInfo> values;
+
+                    for (unsigned i = 0; i < fileEnums[typeName]->Size(); i++)
+                    {
+                        values.Push(fileEnums[typeName]->At(i));
+                    }
+
+                    enums_[fieldName] = values;
+
+                    varType = typeMap_["Enum"];
+
+                    fields_[fieldName] = varType;
+
+                    Variant value;
+                    value.FromString(varType, defaultValue);
+                    defaultFieldValues_[fieldName] = value;
+                }
+
             }
             else
             {

Source/AtomicNET/NETCore/NETComponentClass.h

@@ -31,6 +31,8 @@
 namespace Atomic
 {
 
+class NETAssemblyFile;
+
 /// NET Assembly resource.
 class ATOMIC_API NETComponentClass : public Object
 {
@@ -39,7 +41,7 @@ class ATOMIC_API NETComponentClass : public Object
 public:
 
     /// Construct.
-    NETComponentClass(Context* context);
+    NETComponentClass(Context* context, NETAssemblyFile* assemblyFile);
     /// Destruct.
     virtual ~NETComponentClass();
 
@@ -54,6 +56,8 @@ public:
 
 private:
 
+    WeakPtr<NETAssemblyFile> assemblyFile_;
+
     static void InitTypeMap();
 
     String name_;