mse / ConfectionerEngine (public) (License: Confectioner Engine license) (since 2021-04-24) (hash sha1)
Farming RPG engine
Clone URLs: https://rocketgit.com/user/mse/ConfectionerEngine ssh://rocketgit@ssh.rocketgit.com/user/mse/ConfectionerEngine git://git.rocketgit.com/user/mse/ConfectionerEngine
master
List of commits:
Subject Hash Author Date (UTC)
Add a minimap 3da6d1001bcd89a903cd761492eab1cc23dbd0d6 mse 2021-12-05 16:04:36
Fix special item increment bug 8e7425924c63f56351357e6690d25ee6ecf3048a mse 2021-12-04 06:41:02
Bump version to v0.7.2 a4ccb6ce137ec34ec5852d95f8bff545f8b4b85c mse 2021-12-02 11:41:27
Make interact button also place items 3f1f27d32e162fc9e0cbe5e420b0ec78ef705d15 mse 2021-12-01 13:33:37
Switch entity button to interact a409b707d3e704e4370702bdb77a2a9841e624d3 mse 2021-11-30 06:37:25
Translate Continue button to Greek & bump version to 0.7.1 5dfb837cb70a16a71dc9338e1126f1cd69ada1a2 mse 2021-11-29 09:22:04
Bump version to v0.7.0 e303b764c874b5e61bedc64b634f4ac80d5f27e5 mse 2021-11-28 07:48:29
Add CSL functions, syntax enhancements, OnPlayerEat, & remove init.json a484c33465821c194fe5d34cfef6716de198aaa6 mse 2021-11-27 04:24:46
Fix libs.cpp c736b9be42a871adc4827431961e8b769572c26b mse 2021-11-20 02:34:34
Fix tile seams ae09d59880997b3e1fd1cdf2083f83b3f0f73312 mse 2021-11-20 00:29:03
Make particle light follow sun angle ef944efffd223dd843a1471d6b651f5dc46d871b mse 2021-11-19 22:14:29
Work on particle light and bump version to v0.6.5 73b7b68133f7767f78c47492f693c5e9e965e214 mse 2021-11-19 08:04:32
Improve rim lighting and flatten floor gibs 4a7082e02eda370dba12bb44089777552859c5bd mse 2021-11-18 04:30:05
Change rim lighting to specular 937d99bee19b936fbf95927c5877a915c4128de1 mse 2021-11-18 03:49:41
Add sprite rim lighting eb9ade21b6253e050d6962c273187f090c20ff2a mse 2021-11-18 01:29:22
Bump version to v0.6.4 c2aeae76122cc95d03756a55a528b62609762820 mse 2021-11-17 11:38:37
Attempt to fix JSON serializing in locales with commas beae8b63fb0deaaf0b66ef4f188df270120ebe1c mse 2021-11-17 11:19:18
Limit network settings to network-enabled builds 8ccef75176b9059a45afa9ea251c313be7b7cfe0 mse 2021-11-17 09:20:56
Add /fps console command 207ef051937c91f78dae3928ef004ee7aa7f2a7a mse 2021-11-16 21:33:32
Move userdata to game root directory f9bff9bb941b714e7c0987327804175d852b470b mse 2021-11-16 02:55:04
Commit 3da6d1001bcd89a903cd761492eab1cc23dbd0d6 - Add a minimap
Author: mse
Author date (UTC): 2021-12-05 16:04
Committer name: mse
Committer date (UTC): 2021-12-05 16:04
Parent(s): 8e7425924c63f56351357e6690d25ee6ecf3048a
Signer:
Signing key:
Signing status: N
Tree: 9330580e84a5eb6e26974f6965fa8a1e9c00dfdd
File Lines added Lines deleted
confec.cpp 58 8
File confec.cpp changed (mode: 100644) (index df34ddc..8d05afe)
... ... dialogue::Talk convo;
184 184
185 185 fgl::Font font_vn, font_mono, font_inventory; fgl::Font font_vn, font_mono, font_inventory;
186 186
187 fgl::Texture shadeBox, button_n, button_p;
187 fgl::Texture shadeBox, button_n, button_p, map_overlay;
188 188
189 189 // VN variables. // VN variables.
190 190 long long health = 0, day = 0, money = 0, multiplayer = 0, mainmenu = 0; long long health = 0, day = 0, money = 0, multiplayer = 0, mainmenu = 0;
 
... ... fgl::Texture tex_circle_grey, tex_circle_orange, tex_cursor,
492 492 tex_notification_box, tex_notification_net, tex_notification, tex_notification_box, tex_notification_net, tex_notification,
493 493 tex_recipe_overlay, tex_boxes, tex_box_select, tex_character_select; tex_recipe_overlay, tex_boxes, tex_box_select, tex_character_select;
494 494
495 fgl::Framebuffer framebuffer;
495 fgl::Framebuffer fb_minimap, framebuffer;
496 496
497 497 double circleX = DBL_INF, circleY = DBL_INF; double circleX = DBL_INF, circleY = DBL_INF;
498 498
 
... ... int main( int argc, char* argv[] ){
1125 1125 data_path + "/glsl/sunlit_instance.frag", data_path + "/glsl/sunlit_instance.frag",
1126 1126 { "u_texture" } { "u_texture" }
1127 1127 ); );
1128 fb_minimap = fgl::createFramebuffer( 256, 256 );
1128 1129 framebuffer = fgl::createFramebuffer( fgl::getDisplayWidth(), fgl::getDisplayHeight() ); framebuffer = fgl::createFramebuffer( fgl::getDisplayWidth(), fgl::getDisplayHeight() );
1129 1130 fgl::setPipeline( fgl::colorModPipeline ); fgl::setPipeline( fgl::colorModPipeline );
1130 1131
 
... ... int main( int argc, char* argv[] ){
1133 1134
1134 1135 button_n = loadImage( data_path + "/ui/button_n.png", true, true ); button_n = loadImage( data_path + "/ui/button_n.png", true, true );
1135 1136 button_p = loadImage( data_path + "/ui/button_p.png", true, true ); button_p = loadImage( data_path + "/ui/button_p.png", true, true );
1137 map_overlay = loadImage( data_path + "/ui/map_overlay.png", false, false );
1136 1138
1137 1139 mt = std::mt19937_64( std::time( nullptr ) ); mt = std::mt19937_64( std::time( nullptr ) );
1138 1140
 
... ... void DrawCharacterSelect(){
5344 5346 std::min( choiceIndex + moveXDown, (int)items.size() - 1 ); std::min( choiceIndex + moveXDown, (int)items.size() - 1 );
5345 5347 if( moveXDown && choiceIndex < 0 ) choiceIndex = 0; if( moveXDown && choiceIndex < 0 ) choiceIndex = 0;
5346 5348 double sw = fgl::getDisplayWidth(), sh = fgl::getDisplayHeight(); double sw = fgl::getDisplayWidth(), sh = fgl::getDisplayHeight();
5347 float round_scale = std::round( sh / simScreenHeight2D );
5348 if( round_scale < 1.0f ) round_scale = 1.0f;
5349 float round_scale =
5350 std::max( std::round( sh / simScreenHeight2D ), 1.0 );
5349 5351 float increment_x = tex_character_select.width * round_scale; float increment_x = tex_character_select.width * round_scale;
5350 5352 float increment_y = tex_character_select.height * round_scale; float increment_y = tex_character_select.height * round_scale;
5351 5353 float offset_x = ( sw - increment_x * items.size() ) * 0.5; float offset_x = ( sw - increment_x * items.size() ) * 0.5;
 
... ... void GameLoop( double d ){
5669 5671 } }
5670 5672
5671 5673 // Draw pixel art UI elements at an integer scale for quality. // Draw pixel art UI elements at an integer scale for quality.
5672 float round_scale = std::round( sh / simScreenHeight2D );
5673 if( round_scale < 1.0f ) round_scale = 1.0f;
5674 float round_scale =
5675 std::max( std::round( sh / simScreenHeight2D ), 1.0 );
5674 5676 // Inventory offset X. // Inventory offset X.
5675 5677 float boxOffX = sw - tex_boxes.width * round_scale; float boxOffX = sw - tex_boxes.width * round_scale;
5676 5678
 
... ... void GameLoop( double d ){
6323 6325
6324 6326 vnDraw( sw, sh ); vnDraw( sw, sh );
6325 6327
6326 // Display special screens: Either recipes, trading, sequencer, or
6327 // cake.
6328 // Display special screens: Either recipes, trading, sequencer,
6329 // cake, or minimap.
6328 6330 if( recipes_display ){ if( recipes_display ){
6329 6331 // Draw recipes below the bottom edge of the inventory boxes. // Draw recipes below the bottom edge of the inventory boxes.
6330 6332 float offset_y = tex_boxes.height * round_scale; float offset_y = tex_boxes.height * round_scale;
 
... ... void GameLoop( double d ){
6468 6470 ); );
6469 6471 offset_y += vnScale * font_vn.height * 1.333; offset_y += vnScale * font_vn.height * 1.333;
6470 6472 // TODO. // TODO.
6473 }else if( convo.screen.ids.empty() ){
6474 // Draw to the minimap framebuffer.
6475 fgl::setFramebuffer( fb_minimap );
6476 double
6477 old_w = world.screenWidth,
6478 old_h = world.screenHeight,
6479 old_s = world.scale;
6480 world.screenWidth = fb_minimap.width;
6481 world.screenHeight = fb_minimap.height;
6482 world.scale = 0.2;
6483 glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
6484 // Day/night tinting.
6485 fgl::setFog( ambient_light );
6486 world.drawMap();
6487 world.screenWidth = old_w;
6488 world.screenHeight = old_h;
6489 world.scale = old_s;
6490 // Switch back to the color mod pipeline.
6491 fgl::setPipeline( fgl::colorModPipeline );
6492 // Draw the minimap to the screen.
6493 fgl::setFramebuffer();
6494 auto tex = fgl::getFramebufferTexture( fb_minimap );
6495 fgl::texMatrix = linalg::identity;
6496 fgl::setFog( { 1.0f, 1.0f, 1.0f, 1.0f } );
6497 glDisable( GL_CULL_FACE );
6498 //glDisable( GL_BLEND );
6499 int margin = 18;
6500 float map_scale =
6501 std::max( std::floor( round_scale * 0.5f ), 1.0f );
6502 drawImage(
6503 tex,
6504 sw - ( tex.width + margin ) * map_scale,
6505 sh - margin * map_scale,
6506 0.0f,
6507 map_scale,
6508 -map_scale
6509 );
6510 glEnable( GL_CULL_FACE );
6511 //glEnable( GL_BLEND );
6512 // Draw the map overlay.
6513 drawImage(
6514 map_overlay,
6515 sw - map_overlay.width * map_scale,
6516 sh - map_overlay.width * map_scale,
6517 0.0f,
6518 map_scale,
6519 map_scale
6520 );
6471 6521 } }
6472 6522
6473 6523 glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA ); glBlendFunc( GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA );
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/mse/ConfectionerEngine

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/mse/ConfectionerEngine

Clone this repository using git:
git clone git://git.rocketgit.com/user/mse/ConfectionerEngine

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main