Fix BAD HORRIBLE Queue type bug. Fuck!

main
Cameron Murphy Reikes 2 years ago
parent 35ffcfd987
commit fcd2d5342c

@ -71,6 +71,7 @@
<PlatformToolset>v143</PlatformToolset> <PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization> <WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
<EnableASAN>true</EnableASAN>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">

@ -14,11 +14,12 @@
#define ASSERT_DO_POPUP_AND_CRASH #define ASSERT_DO_POPUP_AND_CRASH
// #define SERVER_ADDRESS "207.246.80.160" // #define SERVER_ADDRESS "207.246.80.160"
// #define PROFILING #define PROFILING
// #define DEBUG_RENDERING // #define DEBUG_RENDERING
// #define DEBUG_WORLD // #define DEBUG_WORLD
#define UNLOCK_ALL #define UNLOCK_ALL
#define TIME_BETWEEN_WORLD_SAVE 1000000.0f // #define TIME_BETWEEN_WORLD_SAVE 1000000.0f
#define TIME_BETWEEN_WORLD_SAVE 1.0f
// #define INFINITE_RESOURCES // #define INFINITE_RESOURCES
#define DEBUG_TOOLS #define DEBUG_TOOLS
#define CHIPMUNK_INTEGRITY_CHECK #define CHIPMUNK_INTEGRITY_CHECK

Binary file not shown.

@ -296,7 +296,7 @@ typedef struct QueryResult
} QueryResult; } QueryResult;
static THREADLOCAL char query_result_data[128 * sizeof(QueryResult)] = {0}; static THREADLOCAL char query_result_data[128 * sizeof(QueryResult)] = {0};
// the data starts off NULL, on the first call sets it to result data // the data starts off NULL, on the first call sets it to result data
static THREADLOCAL Queue query_result = {.data_length = 128 * sizeof(QueryResult), .element_size = sizeof(cpShape *)}; static THREADLOCAL Queue query_result = {.data_length = 128 * sizeof(QueryResult), .element_size = sizeof(QueryResult)};
static void shape_query_callback(cpShape *shape, cpContactPointSet *points, void *data) static void shape_query_callback(cpShape *shape, cpContactPointSet *points, void *data)
{ {

@ -39,7 +39,7 @@
#define ORB_HEAT_FORCE_MULTIPLIER 5.0 #define ORB_HEAT_FORCE_MULTIPLIER 5.0
#define ORB_DRAG_CONSTANT 1.0 #define ORB_DRAG_CONSTANT 1.0
#define ORB_FROZEN_DRAG_CONSTANT 10.0 #define ORB_FROZEN_DRAG_CONSTANT 10.0
#define ORB_HEAT_MAX_DETECTION_DIST 500.0 #define ORB_HEAT_MAX_DETECTION_DIST 100.0
#define ORB_HEAL_RATE 0.2 #define ORB_HEAL_RATE 0.2
#define ORB_MAX_FORCE 200.0 #define ORB_MAX_FORCE 200.0

Loading…
Cancel
Save