浏览代码

gen sprites

Laserlicht 10 月之前
父节点
当前提交
bda4efa8b5
共有 3 个文件被更改,包括 8 次插入5 次删除
  1. 2 0
      client/mainmenu/CMainMenu.cpp
  2. 5 5
      client/mapView/MapRenderer.cpp
  3. 1 0
      client/render/AssetGenerator.h

+ 2 - 0
client/mainmenu/CMainMenu.cpp

@@ -310,6 +310,8 @@ void CMainMenu::playIntroVideos()
 			cb(true);
 			cb(true);
 	};
 	};
 
 
+	AssetGenerator::generateAll();
+
 	playVideo("3DOLOGO.SMK", false, 1.25, [playVideo, this](bool skipped){
 	playVideo("3DOLOGO.SMK", false, 1.25, [playVideo, this](bool skipped){
 		if(!skipped)
 		if(!skipped)
 			playVideo("NWCLOGO.SMK", false, 2, [playVideo, this](bool skipped){
 			playVideo("NWCLOGO.SMK", false, 2, [playVideo, this](bool skipped){

+ 5 - 5
client/mapView/MapRenderer.cpp

@@ -125,7 +125,7 @@ std::shared_ptr<IImage> MapTileStorage::find(size_t fileIndex, size_t rotationIn
 {
 {
 	const auto & animation = animations[fileIndex][rotationIndex];
 	const auto & animation = animations[fileIndex][rotationIndex];
 	if (animation)
 	if (animation)
-		return animation->getImage(imageIndex);
+		return animation->getImage(imageIndex); // ask for group
 	else
 	else
 		return nullptr;
 		return nullptr;
 }
 }
@@ -156,8 +156,8 @@ void MapRendererTerrain::renderTile(IMapRendererContext & context, Canvas & targ
 		return;
 		return;
 	}
 	}
 
 
-	for( auto const & element : mapTile.getTerrain()->paletteAnimation)
-		image->shiftPalette(element.start, element.length, context.terrainImageIndex(element.length));
+//	for( auto const & element : mapTile.getTerrain()->paletteAnimation)
+//		image->shiftPalette(element.start, element.length, context.terrainImageIndex(element.length));
 
 
 	target.draw(image, Point(0, 0));
 	target.draw(image, Point(0, 0));
 }
 }
@@ -193,8 +193,8 @@ void MapRendererRiver::renderTile(IMapRendererContext & context, Canvas & target
 
 
 	const auto & image = storage.find(terrainIndex, rotationIndex, imageIndex);
 	const auto & image = storage.find(terrainIndex, rotationIndex, imageIndex);
 
 
-	for( auto const & element : mapTile.getRiver()->paletteAnimation)
-		image->shiftPalette(element.start, element.length, context.terrainImageIndex(element.length));
+	//for( auto const & element : mapTile.getRiver()->paletteAnimation)
+	//	image->shiftPalette(element.start, element.length, context.terrainImageIndex(element.length));
 
 
 	target.draw(image, Point(0, 0));
 	target.draw(image, Point(0, 0));
 }
 }

+ 1 - 0
client/render/AssetGenerator.h

@@ -23,4 +23,5 @@ public:
 	static void createCombatUnitNumberWindow();
 	static void createCombatUnitNumberWindow();
 	static void createCampaignBackground();
 	static void createCampaignBackground();
 	static void createChroniclesCampaignImages();
 	static void createChroniclesCampaignImages();
+	static void createPaletteShiftedSprites();
 };
 };