Merge with master

TiledCollisionEditor.data

@@ -956,4 +956,14 @@ wH
                            
 <?xpacket end="w"?>'Vk¹bKGD—?Ÿ	pHYsÃÃ
Ço¨dtIMEè
	*)¡
þ‰ëIDATxÚí\Ý–† ,OïÿÊíU紮ƒZ›WûmI¢Ãø³m`9oe{xyƒŒR<<3C>Õë¼ëÿÞÎ<C39E>
 s@Q}Ÿ>
ÊèÙ†Žµ³Ïó<÷}ß‘z×»–çšì{›¥ö¯bD—ŽeÆÀ·fÖ^•¬™hxÄ®:×sé«ü¶mÛn@¯r÷Ù٪ߓ_w¨T?Úé¯Ð3Æ–¨Zå³ôK³¶ºxâ7Š5²0âúµwf<77>Ð<EFBFBD>ü(Ú—1Œûÿë÷z3;);æg>Eö,ëDb~=OBû,ù½~ù’Ú¯üª@'
­¾ô¼–Ûú­
M~¤>ðf3äýnû­nÕê&Ù¿£®-«=Œvf€Õà.èG%ËÒ¬nDzaÉ$²Ú“<C39A>jjß–toñ'G]9K
‹[õ„)lX;ÎÊðeLhžßC‘„’Ò¨÷•ÃvËÙa&[®5½Ja¹.«å>©0ŒñF=ƒ<>dšü–Û§ }šÖпf 3³•'¡ý•×¾2#Ï·¸4-<2D>öäù¨×è
¼(åPy­Yªy$m!Kk¿ê¹´x²Òïl€]<5D>ïÉ‹®ôþçÕï@-g¥|سGó#ù¯üÃb<C383>¬Îg î^.Ë
-]KÅæ[þÞÛµäáitfXb`†•3äÕd‡E?æf	ú~ÑrÁ™yóÛx€Sˆ<1A>yæ÷Ü+æjô©5϶¶ù>ª[+_¶Èï
b´ÿ3õÿÊ[óüì<ݶ´¼ýÍÈ“Y<@Ëk 8 <20>¡[%oÏØ/`•éá9¼zDùƒh)SÜÍÀ˜ÓÂ3™¨Û#›µdl-+O<>¾ÙD‹„¦Ñö36cŒì›R§y‘ÆKs—¿bª§ùÒôc\´o¬uKÆì<19>×ß¿+<2B>µËš]L™^°œW>©AZ¶žGÝ>R?2°¿Î¯9å yºeSÊ:JíW<C3AD>áÛØÿ?í³<C3AD>g´1fžíGåOCû3<C3BB>fæ ²éáUÓXZªç>ñ‘ðÜû}cg•<67>ÆkÏ®œ(˜¬Á^êÄwöXö"DwyÜ~„ÔN
{wö¥FºFdp{–Ïâf…Æ–GkeThýëw±(ÍZï÷„tmË=ÍAH¦€q&¹ÕºÝÄ•ç{brô8ƒΤ—µx‹pèf<C3A8>ãûÖó¿²íÖ=ï™Öó†t3¢gæeS.Rb$Wÿ˜Æ•.l*#C†°<0F>ŒØÌ<C398>Þ6‰é€±°]™t‚TBÜÚ’éÒ±³ÒËCb1yô[GëeiEΓÃÏD›½Ò²¯wÖyoð´Äv霟yŸŸwí8"'ãòÄm[ÞÉÒ©K½ƒo¡DY·oZ.j´.ò\Â+Gá‘Õ9ñN³[IEND®B`‚
+]KÅæ[þÞÛµäáitfXb`†•3äÕd‡E?æf	ú~ÑrÁ™yóÛx€Sˆ<1A>yæ÷Ü+æjô©5϶¶ù>ª[+_¶Èï
b´ÿ3õÿÊ[óüì<ݶ´¼ýÍÈ“Y<@Ëk 8 <20>¡[%oÏØ/`•éá9¼zDùƒh)SÜÍÀ˜ÓÂ3™¨Û#›µdl-+O<>¾ÙD‹„¦Ñö36cŒì›R§y‘ÆKs—¿bª§ùÒôc\´o¬uKÆì<19>×ß¿+<2B>µËš]L™^°œW>©AZ¶žGÝ>R?2°¿Î¯9å yºeSÊ:JíW<C3AD>áÛØÿ?í³<C3AD>g´1fžíGåOCû3<C3BB>fæ ²éáUÓXZªç>ñ‘ðÜû}cg•<67>ÆkÏ®œ(˜¬Á^êÄwöXö"DwyÜ~„ÔN
{wö¥FºFdp{–Ïâf…Æ–GkeThýëw±(ÍZï÷„tmË=ÍAH¦€q&¹ÕºÝÄ•ç{brô8ƒΤ—µx‹pèf<C3A8>ãûÖó¿²íÖ=ï™Öó†t3¢gæeS.Rb$Wÿ˜Æ•.l*#C†°<0F>ŒØÌ<C398>Þ6‰é€±°]™t‚TBÜÚ’éÒ±³ÒËCb1yô[GëeiEΓÃÏD›½Ò²¯wÖyoð´Äv霟yŸŸwí8"'ãòÄm[ÞÉÒ©K½ƒo¡DY·oZ.j´.ò\Â+Gá‘Õ9ñN³[IEND®B`‚‰PNG
+
+
IHDR
`òñ¬ˆ
„iCCPICC profile(‘}‘=HÃ@Å_S¥*-vqÈP<C388>ìbEK‹`¡´Zu0¹ôš4$).Ž‚kÁÁ<C381>Ūƒ‹³®®‚ ø
âìà¤è"%þ/)´ˆñà¸ïî=îÞ
B«ÆT³/¨šed’	1_X¯ð#„AD“˜©§²‹9xŽ¯{øøzåYÞçþ!¥h2À'Ç™nXÄij›–ÎyŸ8Ì*’B|N<eЉ¹.»üƹì°À3ÃF.3O&Ë=,÷0«*ñqDQ5Êò.+œ·8«µëÜ“¿0XÔV²\§9Ž$–<>B"d4PE
¢´j¤˜ÈÐ~ÂÃ?æøÓä’ÉU#ÇêP!9~ð?øÝ­YŠM»IÁÐÿbÛ@`h7mûûضÛ'€ÿ¸Òºþz˜û$½ÙÕ"GÀð6pqÝÕä=àr}Ò%Cr$?M¡TÞÏè›
+ÀÈ-0´æöÖÙÇé<03>£®–o€ƒC`²LÙëïèííß3<C39F>þ~Õ>rÎ"M‡žbKGD—?Ÿ	pHYs.#.#
x¥?vtIMEè
0*Ÿ_±¥tEXtCommentCreated with GIMPW<50>=IDATxÚí<C39A>ÑŽã E›ˆÿÿåîS%6jwû6×缌F*`cLæñ€†<ŸÏ'Z€»Û_eÝF\­ý«å‰¶—•³Êóg"XØ
<'2å£:9êàŒNzS
b"@[¥EÑüûlYY:`"ï3ÜïÐñŒñlÛ¶Íå·mÛV3œlŸ<6C>:<[V¡wÈ¢ëç¬PÔ3—<33>ÿF–
WëTÕÎêïp–îûÊK€ÿ…³ÕuÓÝ
<ßÐqré~(X-l†:¼lO±”éhûÙ~<7E>
+B¸
hž¹£ý˜ËÎu~Sß¿<8εÇ{<7B>UÇë(úÞ^w+?û<>¡Ìþ̾À@°ìø9îIÎöÇQˆÌ'‘ìFšLûNù<4E>.SGÇöUúw
¾×Æ­®ŸÓºWì]Ϧɴ_I~Gùl]ôÏìï;²<>@ï©8Žª˜²ud)	›Zb¶ãÒ›»}©w'–ÈzQWv<57>
+úwEp2Ýé=Fø@•µXÖ“ž­‡YóoDô¡HâŒÕïjy26<îfÀŠìl]œˆ[†Ù<E280A0>¬¸„èʸÃV=@¢
Þ=tŒ$í©^BeÚVgæí²†V•w>ÿhyÞ
øÖÿ`ðÀ[2AT›€²ígÛîÚÿý¶|Ö†2e‘>•ÿ¶^Å<><C385>™ç_b+pf;îñ÷ÑÃ,ѲGù³ý<C2B3><|¶3÷î·êFªH]»Â¾Íœ
+û…3‰”í¾±„ÁïiÿWQѯ³À.EÎ
+ëhÀYùUé´¢õÜÁéÝá~J‡üãƒàÊ%Àf]U£ÌQÿàùoÙ÷Ù¢³×v#‚«£<C2AB>îvç’¿ÛÚQñ.cõÁë,CF5Ãͦ£r¦Äv8Ò¹ÿgÁ£üŽAXåTäù)ìîÁ¦¼[>R¾ZûgëÈÇ|÷û3u|º×ïÛ:ÔòGÊgŸÕF¤LÛ.û—'„èV^]N‘PãLŸbDêpß®ìØŨ¸™ù˜<C3B9>#úüö·ß.¤a+dK²I1”W¼GäŽ&•±oßV¤´Ê΀ΔXî@1<1D>¿Rj¬+õ¯Ð]Vþnè¨0kf¯–&%–fs&„©`ƒ+öWvÂe¼aè¼|Q¥±‹Ô%s
+ºj2‘W¿3II£³øü{‡þ‰Ø¼•ñºÂ(÷yhÎck£¸L>ˆŒýeì6›Ó@ù‡
+6*íüsÊÒu+µBnÇ!®Šöç`@	ÇÓùfÛ
+uۄ
(Žâ®Z^qUuœºcàžÍß%9›Äm¿ÖpRuž»kyeìî¿s	àr`ÙŒLîç7\¿j8Ê:’%ÔJ¥òW,ý ÒL°rû«²j‰€â<væ,uö,vÖx”÷Ûcüy=¬<16>¹íˆ€ˆœXƒlN€Ù>ÁwC€ÀÝ"åA¿gç<<3C>TáŒâ‚Z,ýìÜG¢ÕýÿV¦]yÙu=³ó<¾ú8mäzõŒ
T8N¬°A&ƒûkÍÝSþÚ<C39A>Yw(nWÍÜëƺÉÇ6QA–Õô¿W1‚LÙÎ;á²×;ËŸ­'{3±ræ]Õ	í÷J[wPàœ<C3A0>€™<>ð\ú«ôÜ®–ã]><3E>+e<0C>:Q@özêŽGb+DUŽC#ëyÜçÑß?3gõóøŠþWø†Ý9+óÑvOÙ²ÒxùœÆrbµ¼’‘wa,
à6ë÷Õ—‘‘r$
Iêt+Þèç<0F>ÒkÖÚ‘IEND®B`‚

TiledCollisionEditor/main.cpp

@@ -100,13 +100,22 @@ public:
 			const TilesetObject&obj=tileset.objects.at(selectedObj);
 			const bool EditingQuad=editingPoint<4&&editingQuad!=nullptr;
 
+
+			auto GetSnapPoint=[&](){
+				vf2d worldCoords=view.ScreenToWorld(GetMousePos());
+				if(GetKey(CTRL).bHeld){
+					return vf2d{round(worldCoords.x),round(worldCoords.y)};
+				}
+				return vf2d{round(worldCoords.x/tileset.tilewidth)*tileset.tilewidth,round(worldCoords.y/tileset.tileheight)*tileset.tileheight};
+			};
+
 			if(EditingQuad){
-				(*editingQuad)[editingPoint]=view.ScreenToWorld(GetMousePos());
+				(*editingQuad)[editingPoint]=GetSnapPoint();
 			}
 
 			if(GetMouse(Mouse::LEFT).bPressed){
 				if(EditingQuad){
-					(*editingQuad)[editingPoint]=view.ScreenToWorld(GetMousePos());
+					(*editingQuad)[editingPoint]=GetSnapPoint();
 					editingPoint++;
 				}else{
 					if(obj.collisionTiles.size()==0){
@@ -139,8 +148,8 @@ public:
 			}
 		}
 		
-		/* //Font test.
+		 //Font test.
-		DrawStringDecal({0,0},"the quick brown fox jumps over the lazy dog 1234567890 !@#$%^&*()-=_+[]{}\\;':\",./<>?~`",WHITE,{1.5f,1.5f});
+		/*DrawStringDecal({0,0},"the quick brown fox jumps over the lazy dog 1234567890 !@#$%^&*()-=_+[]{}\\;':\",./<>?~`",WHITE,{1.5f,1.5f});
 		DrawStringDecal({0,18},"THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG 1234567890 !@#$%^&*()-=_+[]{}\\;':\",./<>?~`",WHITE,{1.5f,1.5f});
 		DrawStringPropDecal({0,36},"the quick brown fox jumps over the lazy dog 1234567890 !@#$%^&*()-=_+[]{}\\;':\",./<>?~`",WHITE,{1.5f,1.5f});
 		DrawStringPropDecal({0,54},"THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG 1234567890 !@#$%^&*()-=_+[]{}\\;':\",./<>?~`",WHITE,{1.5f,1.5f});

TiledCollisionEditor/pixelGameEngine.h

@@ -6307,6 +6307,7 @@ namespace olc
 			mapKeys[DOM_PK_END] = Key::END; mapKeys[DOM_PK_PAGE_UP] = Key::PGUP; mapKeys[DOM_PK_PAGE_DOWN] = Key::PGDN;
 			mapKeys[DOM_PK_BACKSPACE] = Key::BACK; mapKeys[DOM_PK_ESCAPE] = Key::ESCAPE;
 			mapKeys[DOM_PK_ENTER] = Key::ENTER; mapKeys[DOM_PK_NUMPAD_EQUAL] = Key::EQUALS;
+			
 			mapKeys[DOM_PK_NUMPAD_ENTER] = Key::ENTER; mapKeys[DOM_PK_PAUSE] = Key::PAUSE;
 			mapKeys[DOM_PK_SCROLL_LOCK] = Key::SCROLL;
 			mapKeys[DOM_PK_NUMPAD_0] = Key::NP0; mapKeys[DOM_PK_NUMPAD_1] = Key::NP1; mapKeys[DOM_PK_NUMPAD_2] = Key::NP2;