Commit: eb8b8622b721eb5f23ee4954146b5305827cdd0a - main (git)

Commit MetaInfo

• Revisión: eb8b8622b721eb5f23ee4954146b5305827cdd0a (tree)
• Tiempo: 2012-09-22 16:16:52
• Autor: h2so5 <h2so5@git....>
• Commiter: h2so5

Log Message

モデルリストのリロードに対応

Cambiar Resumen

• modified: client/3d/model.cpp
• modified: client/3d/model.hpp
• modified: client/Card.cpp
• modified: client/Card.hpp
• modified: client/CardManager.cpp
• modified: client/CardManager.hpp
• modified: client/ResourceManager.cpp
• modified: client/WorldManager.cpp
• modified: client/bin/cards/modellist/main.js
• modified: client/scene/Option.cpp
• modified: client/ui/UIList.cpp
• modified: client/ui/UIList.hpp

Diferencia incremental

--- a/client/3d/model.cpp
+++ b/client/3d/model.cpp
@@ -60,10 +60,15 @@ int GameLoop::Init(std::shared_ptr<CharacterManager> character_manager)
     return 0;
 }
 
-int GameLoop::Logic(InputManager* input)
+int GameLoop::ProcessInput(InputManager* input)
 {
     MoveCamera(input);
     myself_->UpdateInput(input);
+    return 0;
+}
+
+int GameLoop::Update()
+{
     for (auto it = charmgr_->GetAll().begin(); it != charmgr_->GetAll().end(); ++it) {
         auto character = *it;
         character.second->Update();

Binary files a/client/3d/model.hpp and b/client/3d/model.hpp differ

--- a/client/Card.cpp
+++ b/client/Card.cpp
@@ -76,6 +76,7 @@ Card::Card(
 
         context->Global()->Set(String::New("Network"),  script_object->Clone());
         context->Global()->Set(String::New("Player"),  script_object->Clone());
+        context->Global()->Set(String::New("Model"),  script_object->Clone());
         context->Global()->Set(String::New("Account"), script_object->Clone());
         context->Global()->Set(String::New("InputBox"),   script_object->Clone());
         context->Global()->Set(String::New("Card"),    script_object->Clone());
@@ -366,10 +367,16 @@ Handle<Value> Card::Function_Screen_player_focus(const Arguments& args)
     return Undefined();
 }
 
-Handle<Value> Card::Function_Rebuild_Modeltree(const Arguments& args)
+Handle<Value> Card::Function_Model_Rebuild(const Arguments& args)
 {
 	JsonGen jsongen;
 	ResourceManager::BuildModelFileTree();
+
+    auto self = static_cast<Card*>(args.Holder()->GetPointerFromInternalField(0));
+    if (auto card_manager = self->manager_accessor_->card_manager().lock()) {
+		card_manager->OnModelReload();
+    }
+
 	return Undefined();
 }
 
@@ -493,6 +500,22 @@ void Card::Property_set_InputBox_message(Local<String> property, Local<Value> va
     self->inputbox.message_ = *String::Utf8Value(value->ToString());
 }
 
+Handle<Value> Card::Property_Model_onReload(Local<String> property, const AccessorInfo &info)
+{
+    assert(info.Holder()->InternalFieldCount() > 0);
+    auto self = static_cast<Card*>(info.Holder()->GetPointerFromInternalField(0));
+	return self->model.on_reload_;
+}
+
+void Card::Property_set_Model_onReload(Local<String> property, Local<Value> value, const AccessorInfo& info)
+{
+    if (value->IsFunction()) {
+        assert(info.Holder()->InternalFieldCount() > 0);
+        auto self = static_cast<Card*>(info.Holder()->GetPointerFromInternalField(0));
+        self->model.on_reload_ = Persistent<Function>::New(value.As<Function>());
+    }
+}
+
 void Card::SetFunctions()
 {
 
@@ -583,6 +606,16 @@ void Card::SetFunctions()
     script_.SetFunction("Model.all", Function_Model_all);
 
     /**
+     * モデルファイルの構造を再構築します
+     *
+     * @method rebuild
+     * @static
+     */
+	script_.SetFunction("Model.rebuild", Function_Model_Rebuild);
+	
+    script_.SetProperty("Model.onReload", Property_Model_onReload, Property_set_Model_onReload);
+
+    /**
      * プレイヤー
      *
      * @class Player
@@ -791,13 +824,6 @@ void Card::SetFunctions()
      */
     script_.SetFunction("Screen.player_focus", Function_Screen_player_focus);
 
-    /**
-     * モデルファイルの構造を再構築します
-     *
-     * @method player_focus
-     * @static
-     */
-	script_.SetFunction("Model.rebuild", Function_Rebuild_Modeltree);
 //    /**
 //     * ワールド座標をスクリーン座標に変換します
 //     *
@@ -1246,7 +1272,17 @@ void Card::OnClose()
             }
         }
     });
+}
 
+void Card::OnModelReload()
+{
+    if (!model.on_reload_.IsEmpty() && model.on_reload_->IsFunction()) {
+        script_.TimedWith(
+                [&](const Handle<Context>& context)
+                {
+                    model.on_reload_->Call(context->Global(), 0, nullptr);
+                });
+    }
 }
 
 void Card::LoadStorage()

Binary files a/client/Card.hpp and b/client/Card.hpp differ

Binary files a/client/CardManager.cpp and b/client/CardManager.cpp differ

--- a/client/CardManager.hpp
+++ b/client/CardManager.hpp
@@ -36,6 +36,7 @@ class CardManager : public std::enable_shared_from_this<CardManager> {
         void OnReceiveJSON(const std::string& info_json, const std::string& msg_json);
         void OnLogin(const PlayerPtr& player);
         void OnLogout(const PlayerPtr& player);
+		void OnModelReload();
 
         bool IsGUIActive();
         void FocusPlayer();

Binary files a/client/ResourceManager.cpp and b/client/ResourceManager.cpp differ

Binary files a/client/WorldManager.cpp and b/client/WorldManager.cpp differ

--- a/client/bin/cards/modellist/main.js
+++ b/client/bin/cards/modellist/main.js
@@ -13,27 +13,33 @@ var list;
 list = new UI.List({
 	docking: UI.DOCKING_TOP | UI.DOCKING_LEFT | UI.DOCKING_RIGHT | UI.DOCKING_BOTTOM
 });
+Model.onReload = function() {
 
-var even_line = false;
-var model_names = Model.all();
-for (var i = 0; i < model_names.length; i++) {
-	if ((/char:/).test(model_names[i])) {
-		(function(model_name){
-			list.addItem(
-				new UI.Label({
-					docking: UI.DOCKING_TOP | UI.DOCKING_LEFT | UI.DOCKING_RIGHT,
-					text: model_name,
-					bgcolor: ((even_line = !even_line) ? "#EEAFEECC" : "#FFFFFFCC"),
-					onclick: function() {
-						Player.stopMotion();
-						Account.updateModelName(model_name)
-					}
-				})
-			);
-		})(model_names[i])
+	list.clearItems();
+
+	var even_line = false;
+	var model_names = Model.all();
+	for (var i = 0; i < model_names.length; i++) {
+		if ((/char:/).test(model_names[i])) {
+			(function(model_name){
+				list.addItem(
+					new UI.Label({
+						docking: UI.DOCKING_TOP | UI.DOCKING_LEFT | UI.DOCKING_RIGHT,
+						text: model_name,
+						bgcolor: ((even_line = !even_line) ? "#EEAFEECC" : "#FFFFFFCC"),
+						onclick: function() {
+							Player.stopMotion();
+							Account.updateModelName(model_name)
+						}
+					})
+				);
+			})(model_names[i])
+		}
 	}
 }
 
+Model.onReload();
+
 Card.board.width = 240;
 Card.board.height = 120;
 Card.board.docking = UI.DOCKING_BOTTOM | UI.DOCKING_RIGHT

--- a/client/scene/Option.cpp
+++ b/client/scene/Option.cpp
@@ -63,7 +63,8 @@ void Option::End()
 
 BasePtr Option::NextScene()
 {
-    if (start_count_ > 30) {
+	InputManager input;
+    if (input.GetKeyCount(KEY_INPUT_F1) == 1) {
         return background_scene_;
     } else {
         return BasePtr();

--- a/client/ui/UIList.cpp
+++ b/client/ui/UIList.cpp
@@ -75,6 +75,23 @@ Handle<Value> UIList::Function_removeItem(const Arguments& args)
     return args.This();
 }
 
+Handle<Value> UIList::Function_clearItems(const Arguments& args)
+{
+    assert(args.This()->InternalFieldCount() > 0);
+    auto self = std::dynamic_pointer_cast<UIList>(
+            *static_cast<UIBasePtr*>(args.This()->GetPointerFromInternalField(0))
+    );
+    assert(self);
+
+    BOOST_FOREACH(auto it, self->items_) {
+        UIBasePtr chid_ptr = *static_cast<UIBasePtr*>(it->GetPointerFromInternalField(0));
+        chid_ptr->set_parent(Handle<Object>());
+    }
+	self->items_.clear();
+
+    return args.This();
+}
+
 Handle<Value> UIList::Property_scroll_y(Local<String> property, const AccessorInfo &info)
 {
     assert(info.This()->InternalFieldCount() > 0);
@@ -123,6 +140,15 @@ void UIList::DefineInstanceTemplate(Handle<ObjectTemplate>* object)
     SetFunction(object, "removeItem", Function_removeItem);
 
     /**
+     * アイテムをすべて削除します
+     *
+     * @method clearItem
+     * @return {UIObject}　自分自身
+     * @chainable
+     */
+    SetFunction(object, "clearItems", Function_clearItems);
+
+    /**
      * スクロール量(px)
      *
      * @property scroll_y

--- a/client/ui/UIList.hpp
+++ b/client/ui/UIList.hpp
@@ -24,6 +24,7 @@ class UIList : public UIBase {
         /* function */
         static Handle<Value> Function_addItem(const Arguments& args);
         static Handle<Value> Function_removeItem(const Arguments& args);
+        static Handle<Value> Function_clearItems(const Arguments& args);
 
         /* property */
         static Handle<Value> Property_scroll_y(Local<String> property, const AccessorInfo &info);