Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge

Browse source
This commit is contained in:
kaetemi 2014-12-12 01:24:56 +01:00
commit 88702799dd
11 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/nel/tools/build_gamedata/sky_dev.bat Normal file
View file

@ -0,0 +1,11 @@
title Ryzom Core: 1_export.py (LEVELDESIGN)
1_export.py -ipj common/sky common/sfx common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share
title Ryzom Core: 2_build.py (LEVELDESIGN)
2_build.py -ipj common/sky common/sfx common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share
title Ryzom Core: 3_install.py (LEVELDESIGN)
3_install.py -ipj common/sky common/sfx common/gamedev common/data_common common/data_shard common/leveldesign common/exedll common/cfg shard/data_shard shard/data_language shard/data_leveldesign shard/data_game_share
title Ryzom Core: b1_client_dev.py (LEVELDESIGN)
b1_client_dev.py
title Ryzom Core: b2_shard_data.py (LEVELDESIGN)
b2_shard_data.py
title Ryzom Core: Ready

5
code/ryzom/client/src/client_sheets/continent_sheet.cpp
View file

@ -300,6 +300,9 @@ void CContinentParameters::build(const NLGEORGES::UFormElm &item)
if(readSeason<EGSPD::CSeason::Invalid)
ForceDisplayedSeason[season]= readSeason;
}
// Read light cycle
item.getValueByName(LightCycle, "LightCycle");
}
@ -393,6 +396,8 @@ void CContinentParameters::serial(class NLMISC::IStream &f) throw(NLMISC::EStrea
f.serial(SkySheet[i]);
f.serialEnum(ForceDisplayedSeason[i]);
}
//
f.serial(LightCycle);
}
//=========================================================================

5
code/ryzom/client/src/client_sheets/continent_sheet.h
View file

@ -62,9 +62,12 @@ public:
/// LandscapeIG filename.
std::string LandscapeIG;
// New Sky system : gives name of the sky sheet per season. If present, this bypass the SkyDay & SkyNight fields
/// New Sky system : gives name of the sky sheet per season. If present, this bypass the SkyDay & SkyNight fields
std::string SkySheet[EGSPD::CSeason::Invalid];
/// Light Cycle sheet
std::string LightCycle;
/// SkyDay filename.
std::string SkyDay;

5
code/ryzom/client/src/continent.cpp
View file

@ -420,6 +420,11 @@ void CContinent::select(const CVectorD &pos, NLMISC::IProgressCallback &progress
progress.progress (0);
progress.pushCropedValues (0, 1.f/3.f);
{
H_AUTO(InitRZWorldLightCycle)
loadWorldLightCycle(CSheetId(LightCycle));
}
{
H_AUTO(InitRZWorldIndoor)
if (!ClientCfg.Light)

2
code/ryzom/client/src/continent_manager.cpp
View file

@ -587,7 +587,7 @@ void CContinentManager::reloadWeather()
WeatherManager.init();
// Load description of light cycles for each season.
loadWorldLightCycle();
loadWorldLightCycle(CSheetId::Unknown); //FIXME
// Load global weather function parameters
loadWeatherFunctionParams();

2
code/ryzom/client/src/init_main_loop.cpp
View file

@ -411,7 +411,7 @@ static void initWeather()
{
WeatherManager.init();
// Load description of light cycles for each season.
loadWorldLightCycle();
loadWorldLightCycle(CSheetId::Unknown); // FIXME
// Load global weather function parameters
loadWeatherFunctionParams();
//

2
code/ryzom/client/src/interface_v3/action_handler_debug.cpp
View file

@ -442,7 +442,7 @@ class CAHReloadSeason: public IActionHandler
virtual void execute (CCtrlBase * /* pCaller */, const string &/* Params */)
{
// reload all parameters for weather
loadWorldLightCycle();
loadWorldLightCycle(CSheetId::Unknown); // FIXME
loadWeatherFunctionParams();
WeatherManager.init();
ContinentMngr.reloadWeather();

3
code/ryzom/client/src/main_loop_debug.cpp
View file

@ -371,6 +371,9 @@ void displayDebug()
// Current GameCycle
TextContext->printfAt(1.f, line, "Ms per Cycle : %d", NetMngr.getMsPerTick());
line += lineStep;
// Smoothed Client Date
TextContext->printfAt(1.f, line, "Smoothed Client Date : %u %f", SmoothedClientDate.Day, SmoothedClientDate.Hour);
line += lineStep;
// Packet Loss
TextContext->printfAt(1.f, line, "Packet Loss : %.1f %%", NetMngr.getMeanPacketLoss()*100.0f);
line += lineStep;

2
code/ryzom/client/src/sky.cpp
View file

@ -235,7 +235,7 @@ uint CSky::setup(const CClientDate &date, const CClientDate &animationDate, floa
// animate objects
if (_PlayListManager)
{
double globalDate = ((double) _NumHourInDay * date.Day + (double) date.Hour) / _NumHourInDay;
double globalDate = (double)date.Hour / (double)_NumHourInDay;
//nlinfo("global date = %f", (float) globalDate);
_PlayListManager->animate(_AnimLengthInSeconds * globalDate);
}

9
code/ryzom/client/src/weather.cpp
View file

@ -87,9 +87,14 @@ void buildLightCycleDesc(CLightCycleDesc &dest,EGSPD::CSeason::TSeason season)
else dest.DuskRatio = 0.5f;
}
void loadWorldLightCycle()
void loadWorldLightCycle(CSheetId lightCycle)
{
CEntitySheet *sheet = SheetMngr.get(CSheetId("ryzom.light_cycle"));
nldebug("Load light cycle '%s'", lightCycle.toString().c_str());
if (lightCycle == CSheetId::Unknown)
lightCycle = CSheetId("ryzom.light_cycle");
CEntitySheet *sheet = SheetMngr.get(lightCycle);
nlassert(sheet);
if (sheet->type() != CEntitySheet::LIGHT_CYCLE)
{

3
code/ryzom/client/src/weather.h
View file

@ -20,6 +20,7 @@
#define CL_WORLD_LIGHT_CYCLE_H
#include <nel/misc/sheet_id.h>
#include "game_share/season.h"
struct CLightCycleDesc;
@ -47,7 +48,7 @@ extern EGSPD::CSeason::TSeason StartupSeason;
extern CWeatherFunctionParamsSheet *WeatherFunctionParams;
// load the world light cycle from a sheet
void loadWorldLightCycle();
void loadWorldLightCycle(NLMISC::CSheetId lightCycleSheet);
// load the weather function params
void loadWeatherFunctionParams();