天球の色の変化を実装

スカイドームモデルの構造が変化
xからpmx（pmd）に変更（必須）材質が３層化

diff --git a/client/3d/Stage.cpp b/client/3d/Stage.cpp
index 605ea93..dd264d5 100644 (file)
--- a/client/3d/Stage.cpp
+++ b/client/3d/Stage.cpp
@@ -76,6 +76,7 @@ Stage::Stage(const ChannelPtr& channel,const ConfigManagerPtr &config_manager) :
 
     float skymap_scale = skymap_handle_.property().get<float>("scale", 80.0);
     MV1SetScale(skymap_handle_.handle(), VGet(skymap_scale, skymap_scale, skymap_scale));
+
 }
 
 Stage::~Stage()
@@ -324,6 +325,11 @@ const ModelHandle& Stage::map_handle() const
     return map_handle_;
 }
 
+const ModelHandle& Stage::skymap_handle() const
+{
+    return skymap_handle_;
+}
+
 const std::vector<VECTOR>& Stage::start_points() const
 {
     return start_points_;

diff --git a/client/3d/Stage.hpp b/client/3d/Stage.hpp
index eac5627..116273d 100644 (file)
--- a/client/3d/Stage.hpp
+++ b/client/3d/Stage.hpp
@@ -35,6 +35,7 @@ class Stage {
         bool IsNearPoint(const VECTOR& point) const;
 
         const ModelHandle& map_handle() const;
+        const ModelHandle& skymap_handle() const;
         float map_scale() const;
         float min_height() const;
 

diff --git a/client/3d/gameloop.cpp b/client/3d/gameloop.cpp
index aaf7f51..3d36adf 100644 (file)
--- a/client/3d/gameloop.cpp
+++ b/client/3d/gameloop.cpp
@@ -48,7 +48,7 @@ GameLoop::GameLoop(const ManagerAccessorPtr& manager_accessor, const StagePtr& s
          manager_accessor_(manager_accessor),
       camera_default_stat(CameraStatus(7.0f, 0.8f, 0.0f, 20 * DX_PI_F / 180, false)),
       camera(camera_default_stat),
-         light( 34.4100f, 135.2900f)
+         light( 34.4100f, 135.2900f, stage)
 {
     SetupCamera_Perspective(DX_PI_F * 60.0f / 180.0f); // 視野角60度
     SetCameraNearFar(1.0f * stage_->map_scale(), 700.0f * stage_->map_scale());
@@ -348,7 +348,7 @@ void LightStatus::Init()
        SetLightSpcColor( GetColorF(0.603f,0.603f,0.603f,0));
        SetLightAmbColor( GetColorF(1,1,1,0));
 
-       Calc();
+       //Calc();
 
 }
 
@@ -388,9 +388,24 @@ void LightStatus::Calc()
        SetGrobalAmbientColorMatchToTime();
 }
 
+void LightStatus::MaterialInit()
+{
+       auto num = MV1GetMaterialNum(stage_->skymap_handle().handle());
+       for(int i = 0; i < num; ++i ){
+               auto str = tstring(MV1GetMaterialName(stage_->skymap_handle().handle(),i));
+               material_index_of_name_.insert(std::unordered_map<tstring,int>::value_type(str,i));
+               MV1SetMaterialDrawBlendMode(stage_->skymap_handle().handle(),i,DX_BLENDMODE_ALPHA);
+       }
+}
+
 void LightStatus::Update()
 {
-       if(frame_count_++ % ( 60 * 60 ) == 0){
+       if(init_flag_ && stage_.get()){
+               MaterialInit();
+               Calc();
+               init_flag_ = false;
+       }
+       if(frame_count_++ % ( 60 * 60 ) == 0 && !init_flag_){
                Calc();
                frame_count_ = 1;       // オーバーフロー対策
                //SetLightDirectionHandle(light_handle_,VSub(VGet(0,0,0),light_pos_));
@@ -547,9 +562,21 @@ void LightStatus::SetGrobalAmbientColorMatchToTime()
                return seconds + 60 * minutes + 3600 * hours;
        };
 
-       if( CumulativeSeconds( mh, mm, ms ) - ( 60 * 60 ) <= CumulativeSeconds(h,m,s) &&
-               CumulativeSeconds( mh, mm, ms ) + ( 60 * 60 ) >= CumulativeSeconds(h,m,s) ){
-                       int ColorCoefficient =  CumulativeSeconds(h,m,s) - (CumulativeSeconds( mh, mm, ms ) - ( 60 * 60 ));
+       auto now_seconds = CumulativeSeconds(h,m,s);
+       auto mooning_glow_seconds = CumulativeSeconds( mh, mm, ms );
+       auto sunset_seconds = CumulativeSeconds( sh, sm, ss );
+       static int start_offset = ( 60 * 90 );
+       static int end_offset = ( 60 * 30 );
+
+       if( mooning_glow_seconds - start_offset <= now_seconds &&
+               mooning_glow_seconds + end_offset >= now_seconds ){
+                       int ColorCoefficient =  now_seconds - (mooning_glow_seconds - start_offset);
+                       if(0 <= ColorCoefficient && ColorCoefficient <= start_offset ) {
+                               MV1SetMaterialDrawBlendParam(stage_->skymap_handle().handle(),material_index_of_name_[_T("夕方")],(static_cast<float>(ColorCoefficient) / static_cast<float>(start_offset)) * 255.0f);
+                       }
+                       if(start_offset < ColorCoefficient && ColorCoefficient <= start_offset + end_offset ) {
+                               MV1SetMaterialDrawBlendParam(stage_->skymap_handle().handle(),material_index_of_name_[_T("昼")],(static_cast<float>(ColorCoefficient - start_offset) / static_cast<float>(end_offset)) * 255.0f);
+                       }
                        auto r = 0.9f/2.55f * sin(0.001f * (ColorCoefficient - 1000) / 2.0f);
                        r = (r <= 0 ? 0 : r) + ((2201 - ColorCoefficient)/2200.f < 0 ? 0 : ((2201 - ColorCoefficient)/2200.f)*0.603f);
                        auto g = 0.3f/2.55f * sin(0.001f * (ColorCoefficient - 1000) / 1.3f);
@@ -558,9 +585,16 @@ void LightStatus::SetGrobalAmbientColorMatchToTime()
                        b = (b <= 0 ? 0 : b) + ((2201 - ColorCoefficient)/2200.f < 0 ? 0 : ((2201 - ColorCoefficient)/2200.f)*0.603f);
                        SetLightDifColor(GetColorF(r,g,b,0));
                        SetLightSpcColor(GetColorF(r,g,b,0));
-       }else if( CumulativeSeconds( sh, sm, ss ) - ( 60 * 60 ) <= CumulativeSeconds(h,m,s) &&
-               CumulativeSeconds( sh, sm, ss ) + ( 60 * 60 ) >= CumulativeSeconds(h,m,s) ){
-                       int ColorCoefficient =  CumulativeSeconds(h,m,s) - (CumulativeSeconds( sh, sm, ss ) - ( 60 * 60 ));
+                       noon_flag_ = true;
+       }else if( sunset_seconds - start_offset <= now_seconds &&
+               sunset_seconds + end_offset >= now_seconds ){
+                       int ColorCoefficient =  now_seconds - (sunset_seconds - start_offset);
+                       if(0 <= ColorCoefficient && ColorCoefficient <= start_offset ) {
+                               MV1SetMaterialDrawBlendParam(stage_->skymap_handle().handle(),material_index_of_name_[_T("昼")],(static_cast<float>(start_offset - ColorCoefficient) / static_cast<float>(start_offset)) * 255.0f);
+                       }
+                       if(start_offset < ColorCoefficient && ColorCoefficient <= start_offset + end_offset ) {
+                               MV1SetMaterialDrawBlendParam(stage_->skymap_handle().handle(),material_index_of_name_[_T("夕方")],(static_cast<float>(end_offset - ( ColorCoefficient - start_offset ) ) / static_cast<float>(end_offset)) * 255.0f);
+                       }
                        auto r = 1.2f/2.55f * sin(0.001f * (ColorCoefficient) / 1.8f);
                        r = (r <= 0 ? 0 : r) + ((2201 - ColorCoefficient)/2200.f < 0 ? 0 : ((2201 - ColorCoefficient)/2200.f)*0.603f);
                        auto g = 0.225f/2.55f * sin(0.001f * (ColorCoefficient - 1400) / 1.3f);
@@ -569,11 +603,22 @@ void LightStatus::SetGrobalAmbientColorMatchToTime()
                        b = (b <= 0 ? 0 : b) + ((2201 - ColorCoefficient)/2200.f < 0 ? 0 : ((2201 - ColorCoefficient)/2200.f)*0.603f);
                        SetLightDifColor(GetColorF(r,g,b,0));
                        SetLightSpcColor(GetColorF(r,g,b,0));
-       }else if(CumulativeSeconds( sh, sm, ss ) + ( 60 * 60 ) < CumulativeSeconds(h,m,s) ||
-               CumulativeSeconds( mh, mm, ms ) - ( 60 * 60 ) > CumulativeSeconds(h,m,s) ){
+                       night_flag_ = true;
+       }else if(sunset_seconds + end_offset < now_seconds ||
+               mooning_glow_seconds - start_offset > now_seconds ){
+                       if ( night_flag_ ) {
+                               MV1SetMaterialDrawBlendParam(stage_->skymap_handle().handle(),material_index_of_name_[_T("昼")],0);
+                               MV1SetMaterialDrawBlendParam(stage_->skymap_handle().handle(),material_index_of_name_[_T("夕方")],0);
+                               night_flag_ = false;
+                       }
                        SetLightDifColor(GetColorF(0,0,0,0));
                        SetLightSpcColor(GetColorF(0,0,0,0));
        }else{
+                       if ( noon_flag_ ) {
+                               MV1SetMaterialDrawBlendParam(stage_->skymap_handle().handle(),material_index_of_name_[_T("昼")],255);
+                               MV1SetMaterialDrawBlendParam(stage_->skymap_handle().handle(),material_index_of_name_[_T("夕方")],255);
+                               noon_flag_ = false;
+                       }
                        SetLightDifColor(GetColorF(0.603f,0.603f,0.603f,0));
                        SetLightSpcColor(GetColorF(0.603f,0.603f,0.603f,0));
        }

diff --git a/client/3d/gameloop.hpp b/client/3d/gameloop.hpp
index 2ee0904..b74cb29 100644 (file)
Binary files a/client/3d/gameloop.hpp and b/client/3d/gameloop.hpp differ

diff --git a/client/scene/MainLoop.cpp b/client/scene/MainLoop.cpp
index 032f0d7..dfca46c 100644 (file)
--- a/client/scene/MainLoop.cpp
+++ b/client/scene/MainLoop.cpp
@@ -182,6 +182,15 @@ void MainLoop::Draw()
                        }
                }
        }
+
+       if (command_manager_->status() == CommandManager::STATUS_ERROR){
+               SetDrawBlendMode(DX_BLENDMODE_MUL, 120);
+               DrawBox(0,0,config_manager_->screen_width(),config_manager_->screen_height(),GetColor(0,0,0),1);
+               SetDrawBlendMode(DX_BLENDMODE_NOBLEND, 0);
+               auto str = unicode::ToTString("\83T\81[\83o\81[\82Æ\82Ì\90Ú\91±\82ª\90Ø\92f\82³\82ê\82Ü\82µ\82½");
+               auto width = GetDrawStringWidthToHandle(str.c_str(),str.length(),ResourceManager::default_font_handle());
+               DrawStringToHandle(config_manager_->screen_width()/2.0f - width,config_manager_->screen_height()/2.0f - ResourceManager::default_font_size(),str.c_str(),GetColor(255,255,255),ResourceManager::default_font_handle());
+       }
 }
 
 void MainLoop::End()