diff options
| author | chai <chaifix@163.com> | 2021-12-03 11:40:14 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2021-12-03 11:40:14 +0800 |
| commit | e8e2283d264be24fc2f69d536b4bf58d3c403616 (patch) | |
| tree | 9f1ab6fa618d22cac7f01de911a0e341e38907a3 /Client/Source/Phy2DLite/Tests/test.cpp | |
| parent | e9ff46e5c8cc1646eb780e64d01be7b3430a628c (diff) | |
| parent | d9bd02c2471ec14c52df65cf7b5c106eddabe080 (diff) | |
Merge branch 'master' of warmcat.org:/home/git-repo/PND
# Conflicts:
# Client/Project/VisualStudio/PND_LIB/PND_LIB.vcxproj.filters
# Client/Project/VisualStudio/Phy2Dlite/imgui.ini
Diffstat (limited to 'Client/Source/Phy2DLite/Tests/test.cpp')
| -rw-r--r-- | Client/Source/Phy2DLite/Tests/test.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Client/Source/Phy2DLite/Tests/test.cpp b/Client/Source/Phy2DLite/Tests/test.cpp index c2dbc54..0660c21 100644 --- a/Client/Source/Phy2DLite/Tests/test.cpp +++ b/Client/Source/Phy2DLite/Tests/test.cpp @@ -231,6 +231,7 @@ static void Demo5(Body* b, Joint* j) // A teeter static void Demo6(Body* b, Joint* j) { + // µØÃæ Body* b1 = b + 0; b1->Set(Vec2(100.0f, 20.0f), NUMBER_MAX); b1->position.Set(0.0f, (fixed)-0.5f * b1->width.y); |