• R/O
  • SSH
  • HTTPS

Commit

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

X operations(XOPS)に非常に近いFPSゲームを制作・リメイクし、成果物をオープンソースとして公開することを目的としたプロジェクトです。


Commit MetaInfo

Revision273 (tree)
Time2021-09-05 00:41:20
Authorxops-mikan

Log Message

人とマップの当たり判定処理を改良、発砲時の腕の反動計算を改善。

Change Summary

Incremental Difference

--- trunk/object.cpp (revision 272)
+++ trunk/object.cpp (revision 273)
@@ -1476,7 +1476,7 @@
14761476
14771477 //足元の面の角度を取得
14781478 if( CollD->CheckALLBlockIntersectDummyRay(pos_x, pos_y, pos_z, 0.0f, -1.0f, 0.0f, NULL, NULL, &Dist, 1.2f) == true ){
1479- CollD->CheckALLBlockIntersectRay(pos_x, pos_y, pos_z, 0.0f, -1.0f, 0.0f, &id, &face, &Dist, 1.2f);
1479+ CollD->CheckALLBlockIntersectRay(pos_x, pos_y + HUMAN_MAPCOLLISION_CLIMBADDY, pos_z, 0.0f, -1.0f, 0.0f, &id, &face, &Dist, 1.2f + HUMAN_MAPCOLLISION_CLIMBADDY);
14801480
14811481 inblockdata->Getdata(&bdata, id);
14821482
@@ -3038,7 +3038,12 @@
30383038 WeaponParameter ParamData;
30393039 if( Param->GetWeapon(weapon_paramid, &ParamData) != 0 ){ return; }
30403040
3041- reaction_y = DegreeToRadian(0.5f) * ParamData.reaction;
3041+ if( ParamData.scopemode == 2 ){
3042+ reaction_y = DegreeToRadian(4.0f);
3043+ }
3044+ else{
3045+ reaction_y = DegreeToRadian(0.5f) * ParamData.reaction;
3046+ }
30423047 }
30433048 }
30443049
@@ -3081,11 +3086,11 @@
30813086
30823087 //発砲などによる反動
30833088 if( reaction_y > 0.0f ){
3084- if( reaction_y > DegreeToRadian(2) ){ reaction_y -= DegreeToRadian(2); }
3089+ if( reaction_y > DegreeToRadian(0.01f) ){ reaction_y *= 0.5f; }
30853090 else{ reaction_y = 0.0f; }
30863091 }
30873092 if( reaction_y < 0.0f ){
3088- if( reaction_y < DegreeToRadian(2) ){ reaction_y += DegreeToRadian(2); }
3093+ if( reaction_y < DegreeToRadian(-0.01f) ){ reaction_y *= 0.5f; }
30893094 else{ reaction_y = 0.0f; }
30903095 }
30913096