SDL replaced with SDL GPU
This commit is contained in:
BADIM-PC\Vadim committed
1 parent
4ccc317b9f
commit
1777809238
5 files changed
+162
-341
No files matched your search
@@ -1 +1 @@
|
||||
0x78, 0xda, 0xed, 0x59, 0x5d, 0x68, 0x5b, 0xc9, 0x15, 0x1e, 0xe7, 0x67, 0xbb, 0xba, 0x71, 0x33, 0x16, 0x94, 0xa5, 0x3f, 0xdb, 0xe6, 0xa2, 0xee, 0x83, 0x03, 0x36, 0x51, 0x2c, 0x37, 0x2d, 0x06, 0x95, 0x2a, 0xd2, 0x8d, 0xa5, 0xae, 0x2d, 0x19, 0xfd, 0xc4, 0x0d, 0x81, 0x75, 0xb5, 0x8e, 0x6e, 0x22, 0xb0, 0xa5, 0xad, 0x64, 0x6f, 0xd8, 0x14, 0xc3, 0x12, 0x58, 0x50, 0x9f, 0xdc, 0x87, 0x14, 0xaa, 0x27, 0x6d, 0xc9, 0x9b, 0xfb, 0xd2, 0x17, 0xbf, 0x54, 0x50, 0xd3, 0x3e, 0x2e, 0xb4, 0x94, 0xa5, 0xf4, 0xa1, 0x94, 0xbe, 0x94, 0xbe, 0x5e, 0xcf, 0x53, 0x68, 0x58, 0xc8, 0xf4, 0xcc, 0xdc, 0xb9, 0xd2, 0xdc, 0xb9, 0x33, 0xb2, 0x0b, 0xdb, 0x16, 0x8a, 0xe6, 0xe6, 0xf8, 0xcc, 0xcc, 0xb9, 0xe7, 0xcc, 0xcf, 0x77, 0xce, 0xcc, 0x3d, 0xca, 0xcc, 0xc7, 0xaf, 0xa1, 0x57, 0x14, 0x4a, 0x22, 0x91, 0x38, 0xec, 0xf5, 0x7a, 0x87, 0x8c, 0x43, 0xf3, 0x90, 0x92, 0x11, 0x51, 0x7a, 0xea, 0x25, 0x12, 0xd4, 0xeb, 0xf5, 0x88, 0x97, 0x78, 0x4a, 0x3c, 0x7a, 0x48, 0x28, 0x39, 0x24, 0x24, 0x20, 0xae, 0x1f, 0x8f, 0xc7, 0xdb, 0xae, 0xeb, 0xb6, 0x19, 0x87, 0x66, 0x1b, 0xf4, 0x02, 0x62, 0xfa, 0xf1, 0x38, 0xf5, 0x5c, 0x97, 0x78, 0xf1, 0x3a, 0xe8, 0xb7, 0x89, 0x47, 0x7c, 0x3a, 0x25, 0x6d, 0x44, 0xb9, 0x7e, 0x2e, 0x97, 0x1b, 0xf4, 0xfb, 0xfd, 0x01, 0xe3, 0xd0, 0x1c, 0x60, 0x20, 0xd0, 0x1d, 0x08, 0xfd, 0x5c, 0x8e, 0x7a, 0xfd, 0x3e, 0xf1, 0x72, 0xcf, 0x40, 0x7f, 0x40, 0x3c, 0x0c, 0x44, 0x06, 0xa0, 0x3f, 0x10, 0xfa, 0xb5, 0x5a, 0xed, 0x64, 0x38, 0x1c, 0x9e, 0x30, 0x0e, 0x4d, 0x4e, 0x18, 0x61, 0xc6, 0x99, 0x7e, 0xad, 0x46, 0xbd, 0xe1, 0x90, 0x78, 0xb5, 0x63, 0xd0, 0x3f, 0x01, 0x9b, 0x27, 0x84, 0x20, 0x20, 0xc6, 0x3f, 0x3e, 0x3a, 0xb2, 0x8e, 0x58, 0x59, 0x79, 0x7e, 0x74, 0x94, 0x4a, 0x1d, 0xad, 0xa4, 0x52, 0xcf, 0x59, 0x13, 0xfe, 0xac, 0x24, 0x53, 0xa9, 0x8b, 0x81, 0x9c, 0xf7, 0x83, 0x9c, 0xbf, 0x17, 0x91, 0x3f, 0x17, 0xfa, 0x82, 0x43, 0x3b, 0x24, 0x5f, 0x11, 0xf6, 0x57, 0x84, 0xfe, 0xca, 0x58, 0xff, 0x57, 0xc3, 0xe1, 0x95, 0xe1, 0xfd, 0xe3, 0xe1, 0xf0, 0xf8, 0xbe, 0x4f, 0xb5, 0x1a, 0xe7, 0xd0, 0x73, 0x7f, 0xa3, 0x56, 0xbb, 0xfc, 0x43, 0xd7, 0x7d, 0xcd, 0x8d, 0xd7, 0x5d, 0xb7, 0xfe, 0x86, 0x2b, 0x73, 0xa8, 0xbd, 0x31, 0x17, 0x8f, 0xcf, 0x7c, 0xd8, 0xeb, 0xbd, 0xde, 0x7b, 0x3a, 0xdf, 0xe3, 0x34, 0xff, 0xb4, 0x17, 0xd4, 0xa1, 0x36, 0x6f, 0x27, 0x12, 0x17, 0x7e, 0xda, 0xef, 0xc7, 0xfa, 0xcf, 0x0a, 0x7d, 0x4e, 0x85, 0x1c, 0xec, 0x32, 0xe3, 0xcf, 0xfa, 0xcf, 0xe0, 0xef, 0xf7, 0x72, 0xb9, 0x4b, 0x1c, 0x6f, 0x86, 0x3d, 0x7f, 0xfe, 0xc9, 0xeb, 0x37, 0xc0, 0x0f, 0x28, 0x22, 0x6c, 0x6f, 0x5f, 0xd1, 0x43, 0x44, 0x01, 0xfb, 0xd3, 0x43, 0xc0, 0xbf, 0x27, 0x88, 0xf9, 0x03, 0x22, 0xa7, 0x1e, 0xa5, 0x9e, 0xc7, 0xf1, 0x66, 0xd8, 0xbb, 0x2f, 0x80, 0xb3, 0xc7, 0x75, 0xaf, 0x81, 0x1f, 0x8c, 0xf4, 0xdb, 0x84, 0x00, 0xf6, 0x9c, 0xda, 0x2e, 0xa1, 0xdc, 0x0f, 0xe2, 0x63, 0x7d, 0x8e, 0x37, 0xc3, 0xfe, 0xe5, 0xcb, 0x97, 0x83, 0xfe, 0x60, 0xc0, 0xea, 0x25, 0xf0, 0x83, 0x91, 0xfe, 0x80, 0x10, 0xc0, 0x9e, 0xbc, 0x04, 0x1a, 0xf4, 0x09, 0xe5, 0x7e, 0x90, 0x1b, 0xeb, 0x73, 0xac, 0x19, 0xf6, 0x43, 0xc6, 0x3f, 0xe3, 0xf5, 0x2d, 0xf0, 0x83, 0x91, 0xfe, 0x09, 0xa2, 0x80, 0xfd, 0xe9, 0x09, 0xe0, 0x3f, 0x14, 0xc4, 0xfc, 0x21, 0xd0, 0x47, 0x50, 0x4c, 0x3e, 0xc0, 0xfa, 0x65, 0xb9, 0xea, 0x03, 0x61, 0x79, 0xd4, 0x07, 0x42, 0x72, 0x8d, 0x0f, 0x04, 0x72, 0x93, 0x0f, 0xb0, 0x7e, 0x26, 0x37, 0xf9, 0x00, 0xeb, 0x67, 0x72, 0x93, 0x0f, 0xb0, 0x7e, 0x26, 0x37, 0xf9, 0x00, 0xeb, 0xd7, 0xc6, 0x2f, 0x2f, 0x6e, 0xbb, 0x4d, 0x5f, 0xa8, 0xf1, 0x4b, 0x19, 0x9e, 0x6d, 0x86, 0x29, 0xd0, 0x0b, 0x20, 0x84, 0xe6, 0xe2, 0xf0, 0x2f, 0x8e, 0x40, 0x77, 0x4e, 0x50, 0xa8, 0xc0, 0xf8, 0xec, 0x0f, 0xb8, 0x2a, 0x7b, 0x25, 0xa0, 0x99, 0x80, 0xde, 0xa9, 0x79, 0xde, 0xf1, 0x67, 0xff, 0xf0, 0x8e, 0x87, 0x3e, 0xb1, 0xb6, 0x5c, 0xd0, 0xb4, 0xfc, 0x47, 0xcb, 0x38, 0x7e, 0x19, 0x7f, 0x41, 0xa3, 0xf1, 0x8b, 0x58, 0xcc, 0x9e, 0x42, 0xec, 0x72, 0x1f, 0x50, 0xe3, 0x37, 0x80, 0x39, 0xc0, 0x9e, 0x03, 0xcc, 0xfc, 0x81, 0xf9, 0x05, 0xc7, 0x7e, 0x84, 0xb5, 0xc0, 0x7e, 0xc6, 0xf7, 0x07, 0x31, 0xfe, 0x77, 0x53, 0x9e, 0xd7, 0x7d, 0xfc, 0xf7, 0x11, 0xb1, 0xb6, 0x5c, 0x2e, 0x7c, 0x72, 0x6d, 0x0a, 0xd2, 0xb4, 0x4c, 0xcb, 0xb4, 0x98, 0x0b, 0x95, 0x08, 0x49, 0x5c, 0x14, 0x76, 0x4b, 0x31, 0x32, 0x15, 0x26, 0xa3, 0x14, 0x87, 0x78, 0x48, 0x0e, 0x7d, 0x18, 0x33, 0x0e, 0x0d, 0xa8, 0x50, 0xc5, 0x3e, 0x48, 0x41, 0xc8, 0x2b, 0x82, 0xe1, 0xb0, 0xbe, 0xaf, 0x86, 0x08, 0xfc, 0xc1, 0xc4, 0xe7, 0x8a, 0x01, 0x44, 0x26, 0xad, 0x4f, 0xc8, 0x03, 0x52, 0xcc, 0x8f, 0xfb, 0xb0, 0xc1, 0x16, 0x66, 0xe3, 0x63, 0x3e, 0x7f, 0xc6, 0x55, 0xfd, 0xd1, 0x18, 0x14, 0xe9, 0x65, 0xf2, 0x58, 0xd8, 0x3c, 0x5f, 0x42, 0xcf, 0x86, 0x8a, 0x60, 0x61, 0x43, 0xb7, 0xc0, 0x31, 0x8b, 0xd8, 0xa5, 0xd0, 0x1b, 0x50, 0x64, 0x1c, 0x2a, 0xc6, 0xa6, 0x41, 0x3d, 0x6c, 0x81, 0xe3, 0x45, 0xb0, 0xb0, 0xe3, 0x63, 0x1c, 0x96, 0x8b, 0x49, 0xb1, 0xfd, 0x21, 0x66, 0xfb, 0x94, 0x04, 0xef, 0xa2, 0x88, 0x3e, 0x95, 0xc6, 0x51, 0xfd, 0x63, 0x3c, 0x2e, 0xd2, 0xce, 0x5f, 0x1e, 0x5f, 0x30, 0xed, 0xfa, 0x89, 0x41, 0x7f, 0xdc, 0xef, 0x83, 0x13, 0x91, 0x4b, 0x7b, 0xae, 0xdb, 0x7f, 0x55, 0x1e, 0xc1, 0x57, 0xc2, 0x86, 0x83, 0x43, 0Line truncated
|
||||
0x78, 0xda, 0xed, 0x59, 0x5d, 0x68, 0x5b, 0xc9, 0x15, 0x1e, 0xe7, 0x67, 0xbb, 0x52, 0xdc, 0x8c, 0x05, 0x65, 0xe9, 0xcf, 0xb6, 0x11, 0xea, 0x3e, 0x38, 0x60, 0x13, 0xc5, 0x72, 0xd3, 0x62, 0x50, 0xa9, 0x22, 0xdd, 0x58, 0xea, 0xda, 0x92, 0xd1, 0xcf, 0xba, 0x21, 0xb0, 0xae, 0xea, 0xe8, 0x26, 0x06, 0xdb, 0xda, 0x5a, 0x4e, 0x43, 0xb7, 0xb8, 0x2c, 0x81, 0x05, 0xf5, 0xc9, 0x7d, 0x48, 0xa1, 0x7a, 0xd2, 0x96, 0xbc, 0xb9, 0x2f, 0x7d, 0xf1, 0x4b, 0xf5, 0x60, 0xba, 0x8f, 0x0b, 0x2d, 0x65, 0x29, 0x7d, 0x28, 0xcb, 0xbe, 0x94, 0xbe, 0x5e, 0xcf, 0x53, 0x68, 0x58, 0xc8, 0xf4, 0xcc, 0xdc, 0xb9, 0xd2, 0xdc, 0xb9, 0x67, 0x64, 0x17, 0xb6, 0x2d, 0x14, 0xcd, 0xcd, 0xf1, 0x99, 0x99, 0x73, 0xcf, 0x99, 0x9f, 0xef, 0x9c, 0x99, 0x7b, 0x94, 0xa9, 0x0f, 0x5e, 0x21, 0x2f, 0x39, 0x94, 0x54, 0x2a, 0x75, 0xd8, 0xed, 0x76, 0x0f, 0x05, 0x87, 0xe6, 0x21, 0x67, 0x43, 0xe2, 0xfc, 0xd4, 0x4b, 0xa5, 0xb8, 0xd7, 0xed, 0x32, 0x2f, 0xf5, 0x84, 0x79, 0xfc, 0x90, 0x71, 0x76, 0xc8, 0x58, 0x40, 0x52, 0x3f, 0x91, 0x48, 0xb4, 0x5d, 0xd7, 0x6d, 0x0b, 0x0e, 0xcd, 0x36, 0xe8, 0x05, 0x24, 0xf4, 0x13, 0x09, 0xee, 0xb9, 0x2e, 0xf3, 0x12, 0x4d, 0xd0, 0x6f, 0x33, 0x8f, 0xf9, 0x74, 0xca, 0xda, 0x84, 0x4b, 0xfd, 0x42, 0xa1, 0xd0, 0xef, 0xf5, 0x7a, 0x7d, 0xc1, 0xa1, 0xd9, 0xa7, 0x40, 0xa0, 0xdb, 0x57, 0xfa, 0x85, 0x02, 0xf7, 0x7a, 0x3d, 0xe6, 0x15, 0x9e, 0x82, 0x7e, 0x9f, 0x79, 0x14, 0x88, 0xf5, 0x41, 0xbf, 0xaf, 0xf4, 0x1b, 0x8d, 0xc6, 0xc9, 0x60, 0x30, 0x38, 0x11, 0x1c, 0x9a, 0x92, 0x28, 0xa1, 0x82, 0x0b, 0xfd, 0x46, 0x83, 0x7b, 0x83, 0x01, 0xf3, 0x1a, 0xc7, 0xa0, 0x7f, 0x02, 0x36, 0x4f, 0x18, 0x23, 0x40, 0x82, 0x7f, 0x70, 0x74, 0x14, 0x3f, 0x12, 0x65, 0xe9, 0xd9, 0xd1, 0x51, 0x26, 0x73, 0xb4, 0x94, 0xc9, 0x3c, 0x13, 0x4d, 0xf8, 0xb3, 0x94, 0xce, 0x64, 0x2e, 0x06, 0x72, 0xd9, 0x0f, 0x72, 0xf9, 0x5e, 0x44, 0xfe, 0x4c, 0xe9, 0x2b, 0x0e, 0xed, 0x90, 0x7c, 0x49, 0xd9, 0x5f, 0x52, 0xfa, 0x4b, 0x23, 0xfd, 0xdf, 0x0d, 0x06, 0x57, 0x06, 0xf7, 0x8e, 0x07, 0x83, 0xe3, 0x7b, 0x3e, 0x35, 0x1a, 0x92, 0x43, 0xcf, 0xbd, 0xb5, 0x46, 0xe3, 0xf2, 0x0f, 0x5d, 0xf7, 0x15, 0x37, 0xd1, 0x74, 0xdd, 0xe6, 0x6b, 0xae, 0xce, 0xa1, 0xf6, 0xda, 0x4c, 0x22, 0x31, 0xf5, 0x5e, 0xb7, 0xfb, 0x6a, 0xf7, 0xc9, 0x6c, 0x57, 0xd2, 0xec, 0x93, 0x6e, 0x50, 0x87, 0xda, 0x6c, 0x32, 0x95, 0xba, 0xf0, 0xcb, 0x5e, 0x2f, 0xd6, 0x7b, 0x5a, 0xea, 0x49, 0x2a, 0x15, 0x60, 0x97, 0x05, 0x7f, 0xda, 0x7b, 0x0a, 0x7f, 0xbf, 0x57, 0x28, 0x5c, 0x92, 0x78, 0x0b, 0xec, 0xe5, 0xf3, 0x4f, 0x59, 0xbf, 0x01, 0x7e, 0xc0, 0x09, 0x13, 0x7b, 0xfb, 0x92, 0x1f, 0x12, 0x0e, 0xd8, 0x9f, 0x1e, 0x02, 0xfe, 0x5d, 0x45, 0xc2, 0x1f, 0x08, 0x3b, 0xf5, 0x38, 0xf7, 0x3c, 0x89, 0xb7, 0xc0, 0xde, 0x7d, 0x0e, 0x5c, 0x3c, 0xae, 0x7b, 0x0d, 0xfc, 0x60, 0xa8, 0xdf, 0x66, 0x0c, 0xb0, 0x97, 0xd4, 0x76, 0x19, 0x97, 0x7e, 0x90, 0x18, 0xe9, 0x4b, 0xbc, 0x05, 0xf6, 0x2f, 0x5e, 0xbc, 0xe8, 0xf7, 0xfa, 0x7d, 0x51, 0xaf, 0x80, 0x1f, 0x0c, 0xf5, 0xfb, 0x8c, 0x01, 0xf6, 0xec, 0x05, 0x50, 0xbf, 0xc7, 0xb8, 0xf4, 0x83, 0xc2, 0x48, 0x5f, 0x62, 0x2d, 0xb0, 0x1f, 0x08, 0xfe, 0x99, 0xac, 0x6f, 0x80, 0x1f, 0x0c, 0xf5, 0x4f, 0x08, 0x07, 0xec, 0x4f, 0x4f, 0x00, 0xff, 0x81, 0x22, 0xe1, 0x0f, 0x81, 0x3e, 0x81, 0x62, 0xf3, 0x01, 0xd1, 0xaf, 0xcb, 0x4d, 0x1f, 0x08, 0xcb, 0xa3, 0x3e, 0x10, 0x92, 0x23, 0x3e, 0x10, 0xc8, 0x6d, 0x3e, 0x20, 0xfa, 0x85, 0xdc, 0xe6, 0x03, 0xa2, 0x5f, 0xc8, 0x6d, 0x3e, 0x20, 0xfa, 0x85, 0xdc, 0xe6, 0x03, 0xa2, 0x1f, 0x8d, 0x5f, 0x59, 0xdc, 0x76, 0x9b, 0x3f, 0x37, 0xe3, 0x97, 0x0b, 0x3c, 0xdb, 0x02, 0x53, 0xa0, 0xe7, 0x40, 0x84, 0xcc, 0x24, 0xe0, 0x5f, 0x82, 0x80, 0xee, 0x8c, 0xa2, 0x50, 0x81, 0xf1, 0xc5, 0x1f, 0x70, 0x55, 0xf1, 0x4a, 0x40, 0x53, 0x01, 0xbd, 0xdd, 0xf0, 0xbc, 0xe3, 0xcf, 0xfe, 0xe1, 0x1d, 0x0f, 0x7c, 0x12, 0x6d, 0xbd, 0x90, 0x49, 0xf9, 0x8f, 0x96, 0x51, 0xfc, 0x0a, 0xfe, 0x9c, 0x47, 0xe3, 0x97, 0x88, 0x98, 0x3d, 0x85, 0xd8, 0x95, 0x3e, 0x60, 0xc6, 0x6f, 0x00, 0x73, 0x80, 0xbd, 0x04, 0x58, 0xf8, 0x83, 0xf0, 0x0b, 0x89, 0xfd, 0x10, 0x6b, 0x85, 0xfd, 0x94, 0xef, 0x0f, 0x6a, 0xfc, 0xef, 0x66, 0x3c, 0xaf, 0xf3, 0xf8, 0xef, 0x43, 0x12, 0x6d, 0xbd, 0x5c, 0xf8, 0xe8, 0xda, 0x04, 0xa4, 0x49, 0x99, 0x94, 0x49, 0xb1, 0x17, 0xae, 0x11, 0xd1, 0xb8, 0x2a, 0xe2, 0x96, 0x12, 0x64, 0x2b, 0x42, 0xc6, 0x39, 0x0d, 0xf1, 0x90, 0x1c, 0xfa, 0x28, 0x15, 0x1c, 0x1a, 0x50, 0xe1, 0x86, 0x7d, 0x90, 0x82, 0x50, 0x56, 0x14, 0xa3, 0x61, 0x7d, 0x5f, 0x8d, 0x30, 0xf8, 0x43, 0x99, 0xcf, 0x0d, 0x03, 0x84, 0x8d, 0x5b, 0x9f, 0x92, 0x07, 0x64, 0x98, 0x1f, 0xf5, 0x51, 0x8b, 0x2d, 0x2a, 0xc6, 0xa7, 0x72, 0xfe, 0x82, 0x9b, 0xfa, 0xc3, 0x31, 0x38, 0xc1, 0x65, 0xfa, 0x58, 0xd4, 0x3e, 0x5f, 0xc6, 0xcf, 0x86, 0x8a, 0x51, 0x65, 0x03, 0x5b, 0xe0, 0x88, 0x45, 0xec, 0x72, 0xe8, 0x0d, 0x28, 0x32, 0x0e, 0x57, 0x63, 0xf3, 0xa0, 0x1e, 0xb6, 0x20, 0xf1, 0x62, 0x54, 0xd9, 0xf1, 0x31, 0x0e, 0xcb, 0xd5, 0xa4, 0xc4, 0xfe, 0x30, 0xbb, 0x7d, 0xce, 0x82, 0x77, 0x49, 0x44, 0x9f, 0x6b, 0xe3, 0x98, 0xfe, 0x31, 0x1a, 0x97, 0xa0, 0xf3, 0xd7, 0xc7, 0x57, 0x0c, 0x5d, 0x3f, 0xb3, 0xe8, 0x8f, 0xfa, 0x7d, 0x70, 0x22, 0x72, 0x6d, 0xcf, 0xb1, 0xfd, 0x37, 0xe5, 0x11, 0x7c, 0x35, 0x6c, 0x24, 0x38, 0xcc, 0Line truncated
|
||||
BIN
Binary file not shown.
@@ -76,16 +76,6 @@ static void readConfigShowSync(Config* config, lua_State* lua)
|
||||
lua_pop(lua, 1);
|
||||
}
|
||||
|
||||
static void readConfigUseVsync(Config* config, lua_State* lua)
|
||||
{
|
||||
lua_getglobal(lua, "USE_VSYNC");
|
||||
|
||||
if(lua_isboolean(lua, -1))
|
||||
config->data.useVsync = lua_toboolean(lua, -1);
|
||||
|
||||
lua_pop(lua, 1);
|
||||
}
|
||||
|
||||
static void readCursorTheme(Config* config, lua_State* lua)
|
||||
{
|
||||
lua_getfield(lua, -1, "CURSOR");
|
||||
@@ -232,7 +222,6 @@ static void readConfig(Config* config)
|
||||
readConfigCheckNewVersion(config, lua);
|
||||
readConfigNoSound(config, lua);
|
||||
readConfigShowSync(config, lua);
|
||||
readConfigUseVsync(config, lua);
|
||||
readTheme(config, lua);
|
||||
}
|
||||
|
||||
|
||||
+161
-328
@@ -5,7 +5,6 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <time.h>
|
||||
#include <SDL.h>
|
||||
|
||||
#include <SDL_gpu.h>
|
||||
|
||||
@@ -23,10 +22,7 @@ static struct
|
||||
{
|
||||
Studio* studio;
|
||||
|
||||
|
||||
SDL_Window* window;
|
||||
SDL_Renderer* renderer;
|
||||
SDL_Texture* texture;
|
||||
|
||||
struct
|
||||
{
|
||||
@@ -39,7 +35,7 @@ static struct
|
||||
struct
|
||||
{
|
||||
SDL_Joystick* ports[TIC_GAMEPADS];
|
||||
SDL_Texture* texture;
|
||||
GPU_Image* texture;
|
||||
|
||||
tic80_gamepads touch;
|
||||
tic80_gamepads joystick;
|
||||
@@ -61,7 +57,7 @@ static struct
|
||||
|
||||
struct
|
||||
{
|
||||
SDL_Texture* texture;
|
||||
GPU_Image* texture;
|
||||
const u8* src;
|
||||
} mouse;
|
||||
|
||||
@@ -162,56 +158,56 @@ static void updateGamepadParts()
|
||||
platform.gamepad.part.y = (SDL_Point){rect.w - 2*tileSize, 0*tileSize + offset};
|
||||
}
|
||||
|
||||
static void transparentBlit(u32* out, s32 pitch)
|
||||
{
|
||||
const u8* in = platform.studio->tic->ram.vram.screen.data;
|
||||
const u8* end = in + sizeof(platform.studio->tic->ram.vram.screen);
|
||||
const u32* pal = tic_palette_blit(&platform.studio->tic->config.palette);
|
||||
const u32 Delta = (pitch/sizeof *out - TIC80_WIDTH);
|
||||
// static void transparentBlit(u32* out, s32 pitch)
|
||||
// {
|
||||
// const u8* in = platform.studio->tic->ram.vram.screen.data;
|
||||
// const u8* end = in + sizeof(platform.studio->tic->ram.vram.screen);
|
||||
// const u32* pal = tic_palette_blit(&platform.studio->tic->config.palette);
|
||||
// const u32 Delta = (pitch/sizeof *out - TIC80_WIDTH);
|
||||
|
||||
s32 col = 0;
|
||||
// s32 col = 0;
|
||||
|
||||
while(in != end)
|
||||
{
|
||||
u8 low = *in & 0x0f;
|
||||
u8 hi = (*in & 0xf0) >> TIC_PALETTE_BPP;
|
||||
*out++ = low ? (*(pal + low) | 0xff000000) : 0;
|
||||
*out++ = hi ? (*(pal + hi) | 0xff000000) : 0;
|
||||
in++;
|
||||
// while(in != end)
|
||||
// {
|
||||
// u8 low = *in & 0x0f;
|
||||
// u8 hi = (*in & 0xf0) >> TIC_PALETTE_BPP;
|
||||
// *out++ = low ? (*(pal + low) | 0xff000000) : 0;
|
||||
// *out++ = hi ? (*(pal + hi) | 0xff000000) : 0;
|
||||
// in++;
|
||||
|
||||
col += BITS_IN_BYTE / TIC_PALETTE_BPP;
|
||||
// col += BITS_IN_BYTE / TIC_PALETTE_BPP;
|
||||
|
||||
if (col == TIC80_WIDTH)
|
||||
{
|
||||
col = 0;
|
||||
out += Delta;
|
||||
}
|
||||
}
|
||||
}
|
||||
// if (col == TIC80_WIDTH)
|
||||
// {
|
||||
// col = 0;
|
||||
// out += Delta;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
static void initTouchGamepad()
|
||||
{
|
||||
if (!platform.renderer)
|
||||
if (!platform.gpu.screen)
|
||||
return;
|
||||
|
||||
platform.studio->tic->api.map(platform.studio->tic, &platform.studio->tic->config.bank0.map, &platform.studio->tic->config.bank0.tiles, 0, 0, TIC_MAP_SCREEN_WIDTH, TIC_MAP_SCREEN_HEIGHT, 0, 0, -1, 1);
|
||||
// platform.studio->tic->api.map(platform.studio->tic, &platform.studio->tic->config.bank0.map, &platform.studio->tic->config.bank0.tiles, 0, 0, TIC_MAP_SCREEN_WIDTH, TIC_MAP_SCREEN_HEIGHT, 0, 0, -1, 1);
|
||||
|
||||
if(!platform.gamepad.texture)
|
||||
{
|
||||
platform.gamepad.texture = SDL_CreateTexture(platform.renderer, STUDIO_PIXEL_FORMAT, SDL_TEXTUREACCESS_STREAMING, TEXTURE_SIZE, TEXTURE_SIZE);
|
||||
SDL_SetTextureBlendMode(platform.gamepad.texture, SDL_BLENDMODE_BLEND);
|
||||
}
|
||||
// if(!platform.gamepad.texture)
|
||||
// {
|
||||
// platform.gamepad.texture = SDL_CreateTexture(platform.renderer, STUDIO_PIXEL_FORMAT, SDL_TEXTUREACCESS_STREAMING, TEXTURE_SIZE, TEXTURE_SIZE);
|
||||
// SDL_SetTextureBlendMode(platform.gamepad.texture, SDL_BLENDMODE_BLEND);
|
||||
// }
|
||||
|
||||
{
|
||||
void* pixels = NULL;
|
||||
s32 pitch = 0;
|
||||
// {
|
||||
// void* pixels = NULL;
|
||||
// s32 pitch = 0;
|
||||
|
||||
SDL_LockTexture(platform.gamepad.texture, NULL, &pixels, &pitch);
|
||||
transparentBlit(pixels, pitch);
|
||||
SDL_UnlockTexture(platform.gamepad.texture);
|
||||
}
|
||||
// SDL_LockTexture(platform.gamepad.texture, NULL, &pixels, &pitch);
|
||||
// transparentBlit(pixels, pitch);
|
||||
// SDL_UnlockTexture(platform.gamepad.texture);
|
||||
// }
|
||||
|
||||
updateGamepadParts();
|
||||
// updateGamepadParts();
|
||||
}
|
||||
|
||||
static void calcTextureRect(SDL_Rect* rect)
|
||||
@@ -325,49 +321,49 @@ static void processKeyboard()
|
||||
|
||||
static bool checkTouch(const SDL_Rect* rect, s32* x, s32* y)
|
||||
{
|
||||
s32 devices = SDL_GetNumTouchDevices();
|
||||
s32 width = 0, height = 0;
|
||||
SDL_GetWindowSize(platform.window, &width, &height);
|
||||
// s32 devices = SDL_GetNumTouchDevices();
|
||||
// s32 width = 0, height = 0;
|
||||
// SDL_GetWindowSize(platform.window, &width, &height);
|
||||
|
||||
for (s32 i = 0; i < devices; i++)
|
||||
{
|
||||
SDL_TouchID id = SDL_GetTouchDevice(i);
|
||||
// for (s32 i = 0; i < devices; i++)
|
||||
// {
|
||||
// SDL_TouchID id = SDL_GetTouchDevice(i);
|
||||
|
||||
// very strange, but on Android id always == 0
|
||||
//if (id)
|
||||
{
|
||||
s32 fingers = SDL_GetNumTouchFingers(id);
|
||||
// // very strange, but on Android id always == 0
|
||||
// //if (id)
|
||||
// {
|
||||
// s32 fingers = SDL_GetNumTouchFingers(id);
|
||||
|
||||
if(fingers)
|
||||
{
|
||||
platform.gamepad.counter = 0;
|
||||
// if(fingers)
|
||||
// {
|
||||
// platform.gamepad.counter = 0;
|
||||
|
||||
if (!platform.gamepad.show)
|
||||
{
|
||||
platform.gamepad.alpha = platform.studio->config()->theme.gamepad.touch.alpha;
|
||||
SDL_SetTextureAlphaMod(platform.gamepad.texture, platform.gamepad.alpha);
|
||||
platform.gamepad.show = true;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// if (!platform.gamepad.show)
|
||||
// {
|
||||
// platform.gamepad.alpha = platform.studio->config()->theme.gamepad.touch.alpha;
|
||||
// SDL_SetTextureAlphaMod(platform.gamepad.texture, platform.gamepad.alpha);
|
||||
// platform.gamepad.show = true;
|
||||
// return false;
|
||||
// }
|
||||
// }
|
||||
|
||||
for (s32 f = 0; f < fingers; f++)
|
||||
{
|
||||
SDL_Finger* finger = SDL_GetTouchFinger(id, f);
|
||||
// for (s32 f = 0; f < fingers; f++)
|
||||
// {
|
||||
// SDL_Finger* finger = SDL_GetTouchFinger(id, f);
|
||||
|
||||
if (finger && finger->pressure > 0.0f)
|
||||
{
|
||||
SDL_Point point = { (s32)(finger->x * width), (s32)(finger->y * height) };
|
||||
if (SDL_PointInRect(&point, rect))
|
||||
{
|
||||
*x = point.x;
|
||||
*y = point.y;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// if (finger && finger->pressure > 0.0f)
|
||||
// {
|
||||
// SDL_Point point = { (s32)(finger->x * width), (s32)(finger->y * height) };
|
||||
// if (SDL_PointInRect(&point, rect))
|
||||
// {
|
||||
// *x = point.x;
|
||||
// *y = point.y;
|
||||
// return true;
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
return false;
|
||||
}
|
||||
@@ -627,63 +623,6 @@ static void pollEvent()
|
||||
processGamepad();
|
||||
}
|
||||
|
||||
static void blitTexture()
|
||||
{
|
||||
tic_mem* tic = platform.studio->tic;
|
||||
|
||||
SDL_Rect rect = {0, 0, 0, 0};
|
||||
calcTextureRect(&rect);
|
||||
|
||||
void* pixels = NULL;
|
||||
s32 pitch = 0;
|
||||
SDL_LockTexture(platform.texture, NULL, &pixels, &pitch);
|
||||
|
||||
platform.studio->tick();
|
||||
|
||||
memcpy(pixels, tic->screen, sizeof tic->screen);
|
||||
|
||||
SDL_UnlockTexture(platform.texture);
|
||||
|
||||
{
|
||||
enum {Header = OFFSET_TOP};
|
||||
SDL_Rect srcRect = {0, 0, TIC80_FULLWIDTH, Header};
|
||||
SDL_Rect dstRect = {0};
|
||||
SDL_GetWindowSize(platform.window, &dstRect.w, &dstRect.h);
|
||||
dstRect.h = rect.y;
|
||||
SDL_RenderCopy(platform.renderer, platform.texture, &srcRect, &dstRect);
|
||||
}
|
||||
|
||||
{
|
||||
enum {Header = OFFSET_TOP};
|
||||
SDL_Rect srcRect = {0, TIC80_FULLHEIGHT - Header, TIC80_FULLWIDTH, Header};
|
||||
SDL_Rect dstRect = {0};
|
||||
SDL_GetWindowSize(platform.window, &dstRect.w, &dstRect.h);
|
||||
dstRect.y = rect.y + rect.h;
|
||||
dstRect.h = rect.y;
|
||||
SDL_RenderCopy(platform.renderer, platform.texture, &srcRect, &dstRect);
|
||||
}
|
||||
|
||||
{
|
||||
enum {Header = OFFSET_TOP};
|
||||
enum {Left = OFFSET_LEFT};
|
||||
SDL_Rect srcRect = {0, Header, Left, TIC80_HEIGHT};
|
||||
SDL_Rect dstRect = {0};
|
||||
SDL_GetWindowSize(platform.window, &dstRect.w, &dstRect.h);
|
||||
dstRect.y = rect.y;
|
||||
dstRect.h = rect.h;
|
||||
SDL_RenderCopy(platform.renderer, platform.texture, &srcRect, &dstRect);
|
||||
}
|
||||
|
||||
{
|
||||
enum {Top = OFFSET_TOP};
|
||||
enum {Left = OFFSET_LEFT};
|
||||
|
||||
SDL_Rect srcRect = {Left, Top, TIC80_WIDTH, TIC80_HEIGHT};
|
||||
|
||||
SDL_RenderCopy(platform.renderer, platform.texture, &srcRect, &rect);
|
||||
}
|
||||
}
|
||||
|
||||
static void blitGpuTexture(GPU_Target* screen, GPU_Image* texture)
|
||||
{
|
||||
SDL_Rect rect = {0, 0, 0, 0};
|
||||
@@ -736,110 +675,104 @@ static void blitSound()
|
||||
|
||||
static void renderGamepad()
|
||||
{
|
||||
// TODO: uncomment this
|
||||
return;
|
||||
// if(platform.gamepad.show || platform.gamepad.alpha); else return;
|
||||
|
||||
if(platform.gamepad.show || platform.gamepad.alpha); else return;
|
||||
// const s32 tileSize = platform.gamepad.part.size;
|
||||
// const SDL_Point axis = platform.gamepad.part.axis;
|
||||
// typedef struct { bool press; s32 x; s32 y;} Tile;
|
||||
// const Tile Tiles[] =
|
||||
// {
|
||||
// {platform.studio->tic->ram.input.gamepads.first.up, axis.x + 1*tileSize, axis.y + 0*tileSize},
|
||||
// {platform.studio->tic->ram.input.gamepads.first.down, axis.x + 1*tileSize, axis.y + 2*tileSize},
|
||||
// {platform.studio->tic->ram.input.gamepads.first.left, axis.x + 0*tileSize, axis.y + 1*tileSize},
|
||||
// {platform.studio->tic->ram.input.gamepads.first.right, axis.x + 2*tileSize, axis.y + 1*tileSize},
|
||||
|
||||
const s32 tileSize = platform.gamepad.part.size;
|
||||
const SDL_Point axis = platform.gamepad.part.axis;
|
||||
typedef struct { bool press; s32 x; s32 y;} Tile;
|
||||
const Tile Tiles[] =
|
||||
{
|
||||
{platform.studio->tic->ram.input.gamepads.first.up, axis.x + 1*tileSize, axis.y + 0*tileSize},
|
||||
{platform.studio->tic->ram.input.gamepads.first.down, axis.x + 1*tileSize, axis.y + 2*tileSize},
|
||||
{platform.studio->tic->ram.input.gamepads.first.left, axis.x + 0*tileSize, axis.y + 1*tileSize},
|
||||
{platform.studio->tic->ram.input.gamepads.first.right, axis.x + 2*tileSize, axis.y + 1*tileSize},
|
||||
// {platform.studio->tic->ram.input.gamepads.first.a, platform.gamepad.part.a.x, platform.gamepad.part.a.y},
|
||||
// {platform.studio->tic->ram.input.gamepads.first.b, platform.gamepad.part.b.x, platform.gamepad.part.b.y},
|
||||
// {platform.studio->tic->ram.input.gamepads.first.x, platform.gamepad.part.x.x, platform.gamepad.part.x.y},
|
||||
// {platform.studio->tic->ram.input.gamepads.first.y, platform.gamepad.part.y.x, platform.gamepad.part.y.y},
|
||||
// };
|
||||
|
||||
{platform.studio->tic->ram.input.gamepads.first.a, platform.gamepad.part.a.x, platform.gamepad.part.a.y},
|
||||
{platform.studio->tic->ram.input.gamepads.first.b, platform.gamepad.part.b.x, platform.gamepad.part.b.y},
|
||||
{platform.studio->tic->ram.input.gamepads.first.x, platform.gamepad.part.x.x, platform.gamepad.part.x.y},
|
||||
{platform.studio->tic->ram.input.gamepads.first.y, platform.gamepad.part.y.x, platform.gamepad.part.y.y},
|
||||
};
|
||||
// enum {ButtonsCount = 8};
|
||||
|
||||
enum {ButtonsCount = 8};
|
||||
// for(s32 i = 0; i < COUNT_OF(Tiles); i++)
|
||||
// {
|
||||
// const Tile* tile = Tiles + i;
|
||||
// SDL_Rect src = {(tile->press ? ButtonsCount + i : i) * TIC_SPRITESIZE, 0, TIC_SPRITESIZE, TIC_SPRITESIZE};
|
||||
// SDL_Rect dest = {tile->x, tile->y, tileSize, tileSize};
|
||||
|
||||
for(s32 i = 0; i < COUNT_OF(Tiles); i++)
|
||||
{
|
||||
const Tile* tile = Tiles + i;
|
||||
SDL_Rect src = {(tile->press ? ButtonsCount + i : i) * TIC_SPRITESIZE, 0, TIC_SPRITESIZE, TIC_SPRITESIZE};
|
||||
SDL_Rect dest = {tile->x, tile->y, tileSize, tileSize};
|
||||
// SDL_RenderCopy(platform.renderer, platform.gamepad.texture, &src, &dest);
|
||||
// }
|
||||
|
||||
SDL_RenderCopy(platform.renderer, platform.gamepad.texture, &src, &dest);
|
||||
}
|
||||
// if(!platform.gamepad.show && platform.gamepad.alpha)
|
||||
// {
|
||||
// enum {Step = 3};
|
||||
|
||||
if(!platform.gamepad.show && platform.gamepad.alpha)
|
||||
{
|
||||
enum {Step = 3};
|
||||
// if(platform.gamepad.alpha - Step >= 0) platform.gamepad.alpha -= Step;
|
||||
// else platform.gamepad.alpha = 0;
|
||||
|
||||
if(platform.gamepad.alpha - Step >= 0) platform.gamepad.alpha -= Step;
|
||||
else platform.gamepad.alpha = 0;
|
||||
// SDL_SetTextureAlphaMod(platform.gamepad.texture, platform.gamepad.alpha);
|
||||
// }
|
||||
|
||||
SDL_SetTextureAlphaMod(platform.gamepad.texture, platform.gamepad.alpha);
|
||||
}
|
||||
// platform.gamepad.counter = platform.gamepad.touch.data ? 0 : platform.gamepad.counter+1;
|
||||
|
||||
platform.gamepad.counter = platform.gamepad.touch.data ? 0 : platform.gamepad.counter+1;
|
||||
|
||||
// wait 5 seconds and hide touch gamepad
|
||||
if(platform.gamepad.counter >= 5 * TIC_FRAMERATE)
|
||||
platform.gamepad.show = false;
|
||||
// // wait 5 seconds and hide touch gamepad
|
||||
// if(platform.gamepad.counter >= 5 * TIC_FRAMERATE)
|
||||
// platform.gamepad.show = false;
|
||||
}
|
||||
|
||||
static void blitCursor(const u8* in)
|
||||
{
|
||||
if(!platform.mouse.texture)
|
||||
{
|
||||
// TODO: uncomment this
|
||||
return;
|
||||
// if(!platform.mouse.texture)
|
||||
// {
|
||||
// platform.mouse.texture = SDL_CreateTexture(platform.renderer, STUDIO_PIXEL_FORMAT, SDL_TEXTUREACCESS_STREAMING, TIC_SPRITESIZE, TIC_SPRITESIZE);
|
||||
// SDL_SetTextureBlendMode(platform.mouse.texture, SDL_BLENDMODE_BLEND);
|
||||
// }
|
||||
|
||||
platform.mouse.texture = SDL_CreateTexture(platform.renderer, STUDIO_PIXEL_FORMAT, SDL_TEXTUREACCESS_STREAMING, TIC_SPRITESIZE, TIC_SPRITESIZE);
|
||||
SDL_SetTextureBlendMode(platform.mouse.texture, SDL_BLENDMODE_BLEND);
|
||||
}
|
||||
// if(platform.mouse.src != in)
|
||||
// {
|
||||
// platform.mouse.src = in;
|
||||
|
||||
if(platform.mouse.src != in)
|
||||
{
|
||||
platform.mouse.src = in;
|
||||
// void* pixels = NULL;
|
||||
// s32 pitch = 0;
|
||||
// SDL_LockTexture(platform.mouse.texture, NULL, &pixels, &pitch);
|
||||
|
||||
void* pixels = NULL;
|
||||
s32 pitch = 0;
|
||||
SDL_LockTexture(platform.mouse.texture, NULL, &pixels, &pitch);
|
||||
// {
|
||||
// const u8* end = in + sizeof(tic_tile);
|
||||
// const u32* pal = tic_palette_blit(&platform.studio->tic->ram.vram.palette);
|
||||
// u32* out = pixels;
|
||||
|
||||
{
|
||||
const u8* end = in + sizeof(tic_tile);
|
||||
const u32* pal = tic_palette_blit(&platform.studio->tic->ram.vram.palette);
|
||||
u32* out = pixels;
|
||||
// while(in != end)
|
||||
// {
|
||||
// u8 low = *in & 0x0f;
|
||||
// u8 hi = (*in & 0xf0) >> TIC_PALETTE_BPP;
|
||||
// *out++ = low ? (*(pal + low) | 0xff000000) : 0;
|
||||
// *out++ = hi ? (*(pal + hi) | 0xff000000) : 0;
|
||||
|
||||
while(in != end)
|
||||
{
|
||||
u8 low = *in & 0x0f;
|
||||
u8 hi = (*in & 0xf0) >> TIC_PALETTE_BPP;
|
||||
*out++ = low ? (*(pal + low) | 0xff000000) : 0;
|
||||
*out++ = hi ? (*(pal + hi) | 0xff000000) : 0;
|
||||
// in++;
|
||||
// }
|
||||
// }
|
||||
|
||||
in++;
|
||||
}
|
||||
}
|
||||
// SDL_UnlockTexture(platform.mouse.texture);
|
||||
// }
|
||||
|
||||
SDL_UnlockTexture(platform.mouse.texture);
|
||||
}
|
||||
// SDL_Rect rect = {0, 0, 0, 0};
|
||||
// calcTextureRect(&rect);
|
||||
// s32 scale = rect.w / TIC80_WIDTH;
|
||||
|
||||
SDL_Rect rect = {0, 0, 0, 0};
|
||||
calcTextureRect(&rect);
|
||||
s32 scale = rect.w / TIC80_WIDTH;
|
||||
// SDL_Rect src = {0, 0, TIC_SPRITESIZE, TIC_SPRITESIZE};
|
||||
// SDL_Rect dst = {0, 0, TIC_SPRITESIZE * scale, TIC_SPRITESIZE * scale};
|
||||
|
||||
SDL_Rect src = {0, 0, TIC_SPRITESIZE, TIC_SPRITESIZE};
|
||||
SDL_Rect dst = {0, 0, TIC_SPRITESIZE * scale, TIC_SPRITESIZE * scale};
|
||||
// SDL_GetMouseState(&dst.x, &dst.y);
|
||||
|
||||
SDL_GetMouseState(&dst.x, &dst.y);
|
||||
// if(platform.studio->config()->theme.cursor.pixelPerfect)
|
||||
// {
|
||||
// dst.x -= (dst.x - rect.x) % scale;
|
||||
// dst.y -= (dst.y - rect.y) % scale;
|
||||
// }
|
||||
|
||||
if(platform.studio->config()->theme.cursor.pixelPerfect)
|
||||
{
|
||||
dst.x -= (dst.x - rect.x) % scale;
|
||||
dst.y -= (dst.y - rect.y) % scale;
|
||||
}
|
||||
|
||||
if(SDL_GetWindowFlags(platform.window) & SDL_WINDOW_MOUSE_FOCUS)
|
||||
SDL_RenderCopy(platform.renderer, platform.mouse.texture, &src, &dst);
|
||||
// if(SDL_GetWindowFlags(platform.window) & SDL_WINDOW_MOUSE_FOCUS)
|
||||
// SDL_RenderCopy(platform.renderer, platform.mouse.texture, &src, &dst);
|
||||
}
|
||||
|
||||
static void renderCursor()
|
||||
@@ -904,29 +837,6 @@ static void renderCursor()
|
||||
// }
|
||||
}
|
||||
|
||||
static void tick()
|
||||
{
|
||||
pollEvent();
|
||||
|
||||
if(platform.studio->quit)
|
||||
{
|
||||
#if defined __EMSCRIPTEN__
|
||||
emscripten_cancel_main_loop();
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
SDL_RenderClear(platform.renderer);
|
||||
|
||||
blitTexture();
|
||||
renderCursor();
|
||||
renderGamepad();
|
||||
|
||||
SDL_RenderPresent(platform.renderer);
|
||||
|
||||
blitSound();
|
||||
}
|
||||
|
||||
static const char* getAppFolder()
|
||||
{
|
||||
static char appFolder[FILENAME_MAX];
|
||||
@@ -1072,6 +982,14 @@ static void gpuTick()
|
||||
|
||||
pollEvent();
|
||||
|
||||
if(platform.studio->quit)
|
||||
{
|
||||
#if defined __EMSCRIPTEN__
|
||||
emscripten_cancel_main_loop();
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
|
||||
GPU_Clear(platform.gpu.screen);
|
||||
|
||||
{
|
||||
@@ -1201,8 +1119,6 @@ u32 load_shader_program()
|
||||
}
|
||||
}
|
||||
|
||||
#include <math.h>
|
||||
|
||||
static s32 start(s32 argc, char **argv, const char* folder)
|
||||
{
|
||||
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK);
|
||||
@@ -1275,97 +1191,14 @@ static s32 start(s32 argc, char **argv, const char* folder)
|
||||
|
||||
GPU_FreeShaderProgram(platform.gpu.crt_shader);
|
||||
GPU_FreeImage(platform.gpu.texture);
|
||||
GPU_Quit();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static s32 start2(s32 argc, char **argv, const char* folder)
|
||||
{
|
||||
SDL_SetHint(SDL_HINT_WINRT_HANDLE_BACK_BUTTON, "1");
|
||||
SDL_SetHint(SDL_HINT_ACCELEROMETER_AS_JOYSTICK, "0");
|
||||
|
||||
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_JOYSTICK);
|
||||
|
||||
initSound();
|
||||
|
||||
platform.net = createNet();
|
||||
|
||||
platform.window = SDL_CreateWindow( TIC_TITLE, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,
|
||||
(TIC80_FULLWIDTH) * STUDIO_UI_SCALE,
|
||||
(TIC80_FULLHEIGHT) * STUDIO_UI_SCALE,
|
||||
SDL_WINDOW_SHOWN | SDL_WINDOW_RESIZABLE
|
||||
#if defined(__CHIP__)
|
||||
| SDL_WINDOW_FULLSCREEN_DESKTOP
|
||||
#endif
|
||||
);
|
||||
|
||||
platform.studio = studioInit(argc, argv, platform.audio.spec.freq, folder, &systemInterface);
|
||||
|
||||
// set the window icon before renderer is created (issues on Linux)
|
||||
setWindowIcon();
|
||||
|
||||
platform.renderer = SDL_CreateRenderer(platform.window, -1,
|
||||
#if defined(__CHIP__)
|
||||
SDL_RENDERER_SOFTWARE
|
||||
#else
|
||||
SDL_RENDERER_ACCELERATED | (platform.studio->config()->useVsync ? SDL_RENDERER_PRESENTVSYNC : 0)
|
||||
#endif
|
||||
);
|
||||
|
||||
platform.texture = SDL_CreateTexture(platform.renderer, STUDIO_PIXEL_FORMAT, SDL_TEXTUREACCESS_STREAMING, TEXTURE_SIZE, TEXTURE_SIZE);
|
||||
|
||||
initTouchGamepad();
|
||||
|
||||
#if defined(__EMSCRIPTEN__)
|
||||
|
||||
emscripten_set_main_loop(platform.studio->config()->useVsync ? tick : emstick, 0, 1);
|
||||
|
||||
#else
|
||||
{
|
||||
u64 nextTick = SDL_GetPerformanceCounter();
|
||||
const u64 Delta = SDL_GetPerformanceFrequency() / TIC_FRAMERATE;
|
||||
|
||||
while (!platform.studio->quit)
|
||||
{
|
||||
platform.missedFrame = false;
|
||||
|
||||
nextTick += Delta;
|
||||
|
||||
tick();
|
||||
|
||||
{
|
||||
s64 delay = nextTick - SDL_GetPerformanceCounter();
|
||||
|
||||
if(delay < 0)
|
||||
{
|
||||
nextTick -= delay;
|
||||
platform.missedFrame = true;
|
||||
}
|
||||
else SDL_Delay((u32)(delay * 1000 / SDL_GetPerformanceFrequency()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
platform.studio->close();
|
||||
|
||||
closeNet(platform.net);
|
||||
|
||||
if(platform.audio.cvt.buf)
|
||||
SDL_free(platform.audio.cvt.buf);
|
||||
if(platform.gamepad.texture)
|
||||
GPU_FreeImage(platform.gamepad.texture);
|
||||
|
||||
if(platform.mouse.texture)
|
||||
SDL_DestroyTexture(platform.mouse.texture);
|
||||
GPU_FreeImage(platform.mouse.texture);
|
||||
|
||||
SDL_DestroyTexture(platform.gamepad.texture);
|
||||
|
||||
SDL_DestroyTexture(platform.texture);
|
||||
SDL_DestroyRenderer(platform.renderer);
|
||||
SDL_DestroyWindow(platform.window);
|
||||
|
||||
SDL_CloseAudioDevice(platform.audio.device);
|
||||
GPU_Quit();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -66,7 +66,6 @@ typedef struct
|
||||
|
||||
bool checkNewVersion;
|
||||
bool noSound;
|
||||
bool useVsync;
|
||||
bool showSync;
|
||||
|
||||
} StudioConfig;
|
||||
|
||||
Reference in new issue
Block a user