mse / RSOD (public) (License: CC0 and other licenses) (since 2025-03-01) (hash sha1)
Free software FPS engine
Clone URLs: https://rocketgit.com/user/mse/RSOD ssh://rocketgit@ssh.rocketgit.com/user/mse/RSOD git://git.rocketgit.com/user/mse/RSOD
master
List of commits:
Subject Hash Author Date (UTC)
Add continuous particle emitters 60abc606556ec80c0c930a504da4c24e1571fbc5 MSE 2024-12-18 06:45:42
Add defaultRain field (for later use) ecb27b40a1f17abdcdfb72f38945d1f98fabc648 MSE 2024-12-15 02:42:08
Support negative mass particles 37a0a4bfc78adb26ba4b9ba69688738c6c7467dc MSE 2024-12-13 17:35:01
Prevent Avatar::blendTo from freezing on same animation d990a5b32602a879e405c5e527ce3047e346bfba MSE 2024-09-25 02:37:26
Restructure Avatar::simulate 9519e901631ea04a1a93e24504d8f37c521164d1 MSE 2024-09-24 06:51:15
Blend avatar jump animations 8d26db0ecd4ef6a48546684e4bf2200bfea0f41b MSE 2024-09-20 08:19:20
Work on animation blending system eb5cfcf1387131b1ec8449e671d30efd787363b2 MSE 2024-09-20 06:40:35
Update stb_truetype 4948f1d29f33a33dc126d842d8d20f732f4cdef0 MSE 2024-09-18 17:38:06
Allow joystick to override mouse 6aba7a71ebe0dbd67717ae5a37e1729ebfe9895c MSE 2024-09-15 23:13:30
Add weapon switching via D-pad db14ce946f4c65ab6625875f00f82ee1b8052374 MSE 2024-09-15 20:10:20
Allow crouch to be turned off via playerCrouch flag 024d43d877ca16d21e0feeb50d70f82acd449335 MSE 2024-09-15 03:02:29
Add configurable third-person camera pitch constraints 9e2ebdd325515a5bc83cd49229cb099738fb9e0e MSE 2024-09-11 21:02:38
Add configurable thirdPersonCameraAutoRotateSpeed c3104421a4df91fbda573dadcce135f8016fa40e MSE 2024-09-11 19:27:17
Fix inventory display bug 8626c06403b025c6423ec249771598375791b6ca MSE 2024-09-02 23:38:01
Highlight agents and default MSAA to 2 f51dcb39a8abf3d2800d074dfc9606c1c8d486ec MSE 2024-08-27 03:46:04
Fix bad math e0ef61f3961a4d98608fb2c724cb631955ae1d82 MSE 2024-08-24 22:04:23
Smooth camera auto-rotation 0ddcd28b59e564e123a4984d26d2ec80a9f57ec7 MSE 2024-08-24 21:58:32
Allow free look in third-person a8b209cdd85ae914027ffd6c04990b75e9752578 MSE 2024-08-24 21:26:39
Auto-rotate third-person camera b9f034155274b8dc20b9f33d1fc39ce701017b0d MSE 2024-08-24 04:25:51
Use common math to rotate avatars 75e98c52899f17d8d511e733c1445f5eb69b738a MSE 2024-08-24 02:03:53
Commit 60abc606556ec80c0c930a504da4c24e1571fbc5 - Add continuous particle emitters
Author: MSE
Author date (UTC): 2024-12-18 06:45
Committer name: MSE
Committer date (UTC): 2024-12-18 06:45
Parent(s): ecb27b40a1f17abdcdfb72f38945d1f98fabc648
Signer:
Signing key:
Signing status: N
Tree: f58366667196244f9b33056b4e4b7435af9402e7
File Lines added Lines deleted
include/particle.h 42 0
src/fdungeon.cpp 23 2
File include/particle.h changed (mode: 100644) (index 6070bc5..b5629e7)
... ... class ParticleTemplate {
43 43 double endMass = 1.0; double endMass = 1.0;
44 44 double maxAge = DBL_MAX; double maxAge = DBL_MAX;
45 45 double damage = 0.0; double damage = 0.0;
46 double frequency = 0.0; // Bursts per second. Only used by particle emitters.
46 47 ParticleTemplate( const std::string &text = "" ); ParticleTemplate( const std::string &text = "" );
47 48 }; };
48 49
 
... ... class ParticleServer {
82 83 ParticleServer(); ParticleServer();
83 84 }; };
84 85
86 class ParticleEmitter {
87 public:
88 ParticleServer *ps; // Set in constructor.
89 ParticleTemplate pt_main; // Set in constructor.
90 ParticleTemplate pt_impact; // Set in constructor.
91 linalg::vec<double,3> translation = {0.0, 0.0, 0.0};
92 double counter = 0.0;
93 void emit( double d, void *userptr = nullptr );
94 ParticleEmitter(
95 ParticleServer *_ps = nullptr,
96 ParticleTemplate _pt_main = ParticleTemplate(),
97 ParticleTemplate _pt_impact = ParticleTemplate() );
98 };
99
85 100 // Implementation begins here. // Implementation begins here.
86 101
87 102 #ifdef PARTICLE_IMPLEMENTATION #ifdef PARTICLE_IMPLEMENTATION
 
... ... ParticleTemplate::ParticleTemplate( const std::string &text ){
132 147 if( info["damage"] ){ if( info["damage"] ){
133 148 damage = info["damage"].getDouble(); damage = info["damage"].getDouble();
134 149 } }
150 if( info["frequency"] ){
151 frequency = info["frequency"].getDouble();
152 }
135 153
136 154 jsonFreeDocument( &allocatedDocument ); jsonFreeDocument( &allocatedDocument );
137 155 } }
 
... ... ParticleServer::ParticleServer(){
263 281 seed = std::time( nullptr ); seed = std::time( nullptr );
264 282 } }
265 283
284 // Emit a burst of particles at pt_main's frequency. TODO: pt_impact bursts
285 void ParticleEmitter::emit( double d, void *userptr ){
286 if(!ps) return;
287 const double period = 1.0 / pt_main.frequency;
288 counter += d;
289 if( counter > period ){
290 counter = std::fmod( counter, period );
291 ps->addOmniBurst(
292 pt_main.num, pt_main.vel, translation,
293 pt_main.startScale, pt_main.endScale,
294 pt_main.startMass, pt_main.endMass, pt_main.maxAge,
295 pt_main.damage, userptr );
296 }
297 }
298
299 ParticleEmitter::ParticleEmitter(
300 ParticleServer *_ps,
301 ParticleTemplate _pt_main,
302 ParticleTemplate _pt_impact ){
303 ps = _ps;
304 pt_main = _pt_main;
305 pt_impact = _pt_impact;
306 }
307
266 308 #endif // PARTICLE_IMPLEMENTATION #endif // PARTICLE_IMPLEMENTATION
267 309
268 310 #endif // PARTICLE_H #endif // PARTICLE_H
File src/fdungeon.cpp changed (mode: 100644) (index d157078..d9b3cc4)
... ... struct Agent {
128 128 std::map<std::string,double> ammo; // Ammo counts (to be displayed as properties of weapons and avoid inventory clutter). std::map<std::string,double> ammo; // Ammo counts (to be displayed as properties of weapons and avoid inventory clutter).
129 129 std::map<std::string,double> skills; // "Skills" affect combat. Can also be used to store quest progress. std::map<std::string,double> skills; // "Skills" affect combat. Can also be used to store quest progress.
130 130 std::string dungeonFile; // The last dungeon the agent was seen in. std::string dungeonFile; // The last dungeon the agent was seen in.
131 std::string particleEmitterFile;
132 ParticleEmitter particleEmitter;
131 133 std::string avatarFile; std::string avatarFile;
132 134 Avatar avatar; Avatar avatar;
133 135 std::string modelFile; std::string modelFile;
 
... ... Agent *Dungeon::parseAgent( const std::string &text, std::string filePath, linal
2122 2124 a->skills[viewToString( skill.name )] = skill.value.getDouble(); a->skills[viewToString( skill.name )] = skill.value.getDouble();
2123 2125 } }
2124 2126 } }
2125 // Load the agent's dungeon file string.
2127 // Set the agent's dungeon file string.
2126 2128 if( info["dungeonFile"] ){ if( info["dungeonFile"] ){
2127 2129 a->dungeonFile = viewToString( info["dungeonFile"].getString() ); a->dungeonFile = viewToString( info["dungeonFile"].getString() );
2128 2130 } }
2131 // Load the agent's particle emitter.
2132 if( info["particleEmitter"] ){
2133 // Get the file name of the particle template to be used for the emitter.
2134 a->particleEmitterFile = viewToString(info["particleEmitter"].getString());
2135 // Load the particle template.
2136 ParticleTemplate pt_main = loadParticles(a->particleEmitterFile);
2137 // Create a particle server for the texture, replacing the existing particle server if necessary.
2138 particleServers[pt_main.texture] = ParticleServer();
2139 // Create the particle emitter with a reference to the particle server, a copy of the particle template,
2140 // and an empty particle template to eventually be used for particle impacts. (TODO)
2141 a->particleEmitter = ParticleEmitter(&particleServers[pt_main.texture], pt_main, ParticleTemplate());
2142 }
2129 2143 // Load the agent's model. // Load the agent's model.
2130 2144 if( info["model"] ){ if( info["model"] ){
2131 2145 a->modelFile = viewToString( info["model"].getString() ); a->modelFile = viewToString( info["model"].getString() );
 
... ... std::string Dungeon::serializeAgent( Agent *a ){
2595 2609 } }
2596 2610 str += " },\n"; str += " },\n";
2597 2611 str += "\t\"dungeonFile\": \"" + dungeonFile + "\",\n"; // The current dungeon file. str += "\t\"dungeonFile\": \"" + dungeonFile + "\",\n"; // The current dungeon file.
2612 str += "\t\"particleEmitter\": \"" + a->particleEmitterFile + "\",\n";
2598 2613 str += "\t\"model\": \"" + a->modelFile + "\",\n"; str += "\t\"model\": \"" + a->modelFile + "\",\n";
2599 2614 str += "\t\"modelDestroyed\": \"" + a->modelDestroyedFile + "\",\n"; str += "\t\"modelDestroyed\": \"" + a->modelDestroyedFile + "\",\n";
2600 2615 str += "\t\"modelLoop\": \"" + std::to_string(a->modelLoop) + "\",\n"; str += "\t\"modelLoop\": \"" + std::to_string(a->modelLoop) + "\",\n";
 
... ... std::pair<bool,Agent*> Dungeon::agentFireWeapon( Agent *a, std::string weapon, s
3386 3401 auto ray = getAgentGazeRay(a, weap.range, pitch); auto ray = getAgentGazeRay(a, weap.range, pitch);
3387 3402 // Emit particles. // Emit particles.
3388 3403 auto ps_it = particleServers.find(weap.particleFire.texture); auto ps_it = particleServers.find(weap.particleFire.texture);
3389 if(ps_it != particleServers.end()){
3404 if(ps_it != particleServers.end() && weap.particleFire.vel != 0.0){
3390 3405 double startScale = weap.particleFire.startScale, double startScale = weap.particleFire.startScale,
3391 3406 endScale = weap.particleFire.endScale, endScale = weap.particleFire.endScale,
3392 3407 startMass = weap.particleFire.startMass, startMass = weap.particleFire.startMass,
 
... ... void Dungeon::simulate( double maxDraw, double d, std::string defenseSkill ){
3958 3973 } }
3959 3974 } }
3960 3975 } }
3976 // Particles.
3977 if( agent_ptr->particleEmitter.ps ){
3978 agent_ptr->particleEmitter.translation =
3979 getAgentPoseMat(agent_ptr)[3].xyz();
3980 agent_ptr->particleEmitter.emit(d, (void*)agent_ptr);
3981 }
3961 3982 // Animations. // Animations.
3962 3983 if( agent_ptr->model ){ if( agent_ptr->model ){
3963 3984 fgltf::Scene &scn = *agent_ptr->model; fgltf::Scene &scn = *agent_ptr->model;
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/mse/RSOD

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/mse/RSOD

Clone this repository using git:
git clone git://git.rocketgit.com/user/mse/RSOD

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main