Meadville Space Center
Welcome, Guest. Please login or register.
July 02, 2020, 01:07:39 PM

Login with username, password and session length
Search:     Advanced search
Welcome to the new Meadville Space Center forums!
25068 Posts in 2094 Topics by 2266 Members
Latest Member: twa517
* Home Help Search Login Register
+  Meadville Space Center
|-+  Project Apollo - NASSP
| |-+  Project Apollo - NASSP Development
| | |-+  Programming (Moderators: movieman, dseagrav, Swatch, lassombra)
| | | |-+  IMPORTANT! - Project source code rearranging proposal
« previous next »
Pages: [1] 2 3 Print
Author Topic: IMPORTANT! - Project source code rearranging proposal  (Read 12227 times)
Artlav
Full Member
***
Posts: 36


746021
View Profile WWW
« on: February 03, 2009, 12:54:31 PM »

As i looked at the structure of the sources in the CVS, the first and continuous thought i had was like "What A Mess...".

So, i rearranged the files, cleaned up repeats and trash, wrote a resequencer program to update VC2005 & '08 project files for new paths, etc.
The result is here:
http://orbides.1gb.ru/ProjectApollo_090203_reseq.zip (2 Mb, sans bitmaps)

The idea is - build environment files and object files generated during the build go in one place and sources are sorted into 7 categories by their purpose or vehicle.

Status -
The VC2005 environment was tested and works fully, the VC2008 was processed, but not tested - some tweaks might be needed, VC6 was not processed yet for being a different file format, and doxygen files are not updated.
Also, i might have misplaced a file or two, being not very familiar with what abbreviation means what in Apollo.


So, the questions are - does it make sense, would you use it and if yes, what does not look good?

.
« Last Edit: February 04, 2009, 06:38:26 PM by Tschachim » Logged
Tschachim
Project Apollo - NASSP
Administrator
Hero Member
*****
Posts: 3700


nassp.sf.net


View Profile WWW
« Reply #1 on: February 03, 2009, 05:33:52 PM »

Thanks for your efforts, it looks like a great idea for me. I need to check a couple of thinks to give a more comprehensive answer, at a first glance I'd divide Earth into Launch and Landing with FloatBag, DrogueChute and MainChute in Landing, also there are some CSM specific files (SECS, SCS, ECS) and Saturn stages (S-II) in sys etc., but in general it's a good idea!  Happy

Comments and opinions are wanted, of course, moreover it's important to know how much trouble such a change would cause to the developers. I'm editing a lot of files currently, but I'd be able to merge my stuff, but I've no clue about the status of the other developers?

Cheers
Tschachim
Logged

bluespace88
Project Team Member
Full Member
****
Posts: 241



View Profile
« Reply #2 on: February 03, 2009, 05:41:17 PM »

I don't mind.  I usually edit one of the source files anyway, but this is a good idea to organize it.  As long as the changes extend to VC++ 6.0, then I'm fine with it.
Logged
Artlav
Full Member
***
Posts: 36


746021
View Profile WWW
« Reply #3 on: February 04, 2009, 10:20:48 AM »

Good, i've rearranged the stages and systems as was noticed, and VC6 was processed and tested.
Do anyone use VC2008? It should work if VC2005 works, but surprises are not ruled out.

http://orbides.1gb.ru/ProjectApollo_090204_reseq.zip (2 Mb, sans bitmaps)

There also is a question - who is working on what?
What parts of the code can be harmlessly changed, and what better be left alone to avoid repeats and unmergeability?

Logged
Tschachim
Project Apollo - NASSP
Administrator
Hero Member
*****
Posts: 3700


nassp.sf.net


View Profile WWW
« Reply #4 on: February 04, 2009, 11:00:36 AM »

What parts of the code can be harmlessly changed, and what better be left alone to avoid repeats and unmergeability?

I'm working on the ECS, EPS and some other CSM systems, file-wise this is PanelSDK, ecs and everything that starts with "sat". Happy
As long as you change these files because of the new file structure (include paths etc.) I've no problems with merging on my side, anything else we should coordinate (not only because of changed files but also to discuss requirements).

Cheers
Tschachim
Logged

Artlav
Full Member
***
Posts: 36


746021
View Profile WWW
« Reply #5 on: February 04, 2009, 11:23:18 AM »

As long as you change these files because of the new file structure (include paths etc.) I've no problems with merging on my side, anything else we should coordinate (not only because of changed files but also to discuss requirements).
Well, i'm familiarizing myself with the code (that triggered the rearrangement of the mess in the first place) by doing some small-scale cleanups and compression, like for example, merging the main and drogue chutes nearly identical code into one dll:
http://orbides.1gb.ru/ProjectApollo_090204_reseq_chutemerge.zip (62Kb)
Is that acceptable, btw?

Also, i've updated all of the CollisionSDK definitions, as present in the rearranged package.
Do you have some kind of bug tracker or to-do list?
Logged
Tschachim
Project Apollo - NASSP
Administrator
Hero Member
*****
Posts: 3700


nassp.sf.net


View Profile WWW
« Reply #6 on: February 04, 2009, 11:31:04 AM »

...like for example, merging the main and drogue chutes nearly identical code into one dll:
http://orbides.1gb.ru/ProjectApollo_090204_reseq_chutemerge.zip (62Kb)
Is that acceptable, btw?

Sure, as long as it's still working like before. (Which I can't check quickly, but if you tested it, I believe you) Wink

Do you have some kind of bug tracker or to-do list?

http://sourceforge.net/tracker2/?group_id=129726

Cheers
Tschachim
Logged

Tschachim
Project Apollo - NASSP
Administrator
Hero Member
*****
Posts: 3700


nassp.sf.net


View Profile WWW
« Reply #7 on: February 04, 2009, 12:02:39 PM »

I checked your lastest zip and assuming you didn't forgot a file I'd propose the following changes/moves:

src_aux (i.e. technical or Orbiter stuff not related to spacecraft systems)

   PanelSDK, yaAGC -> src_sys
   yaAGS -> src_lm (LM's abort guidance computer, see below)
   Resources.* -> src_csm, this are the CSM panel bitmaps (and we shoud do a LEMResources.h, matching LEMResources.rc instead of reusing resources.h) (and it's LM, not LEM Wink)
   
src_csm (i.e. CSM specific stuff)

   Astp.* -> src_saturn (ASTP stage)
   DrogueChute/MainChute.* (or CMChute as discussed) -> src_landing
   LES.* -> src_saturn (LES stage)

src_launch (renamed src_earth, i.e. launch site stuff)

   FloatBag.* -> src_landing

src_landing (new, landing side stuff)

src_mfd (is fine)

src_lm (renamed src_moon, the LM is a mess right now compared to the CSM, but we should really distinguish between the LM and the lunar landing site stuff)

   leva.* -> src_moon
   LRV.* -> src_moon
   
src_moon (new, as the old one is renamed to src_lm)

src_saturn

   satswitches.* -> src_csm
   satsystems.cpp -> src_csm
   saturn.* (this is a hard one as it is half Saturn half CSM, but I'd say:) -> src_csm
   saturnmesh.* -> src_csm
   saturnpanel.* -> src_csm
   saturnvc.* -> src_csm
   
src_sys (i.e. spacecraft systems used by the CSM and the LM)

   iu.* -> src_saturn (Saturn Instrument Unit)
   lm_channels.h, lmscs.* -> src_lm
   lvimu.* -> src_saturn (LV = Launch Vehicle)   


How do we want to do the "move"? Do you want CVS access and just commit that?
   
Cheers
Tschachim
Logged

Artlav
Full Member
***
Posts: 36


746021
View Profile WWW
« Reply #8 on: February 04, 2009, 01:24:04 PM »

I checked your lastest zip and assuming you didn't forgot a file I'd propose the following changes/moves:
Incorporated, sorted, rebuilded:
http://orbides.1gb.ru/ProjectApollo_090204_reseq-2.zip
VC2005 and VC6 tested, VC2008 processed, but untested.
It all builds and flies (A7 non-VAGC launch to splashdown), so i assume i didn't miss anything.

How do we want to do the "move"? Do you want CVS access and just commit that?
It's all in the zip, so i guess you can do it in whatever way you want.
As for CVS access - better not. It's a kind of a thing i usually and unexpectedly screw up.
Logged
Tschachim
Project Apollo - NASSP
Administrator
Hero Member
*****
Posts: 3700


nassp.sf.net


View Profile WWW
« Reply #9 on: February 05, 2009, 09:56:51 AM »

OK, first tests were fine, so in my opinion we can go ahead, great job, Artlav!  Thumbs Up
I'm going to do further tests and to merge my stuff the next days and plan to commit the rearranged source code at the beginning of next week.

So if anyone has a problem with this change please post here as soon as possible, so we can discuss that before I'm committing it!


Cheers
Tschachim
Logged

dseagrav
Moderator
Hero Member
****
Posts: 1118


View Profile
« Reply #10 on: February 05, 2009, 01:26:50 PM »

I don't mind. I'll have to copy my changes over afterward anyway because restoring my backup made CVS think I edited every file.

PS: I do use VS 2008.

Logged
Tschachim
Project Apollo - NASSP
Administrator
Hero Member
*****
Posts: 3700


nassp.sf.net


View Profile WWW
« Reply #11 on: February 09, 2009, 09:11:41 AM »

OK, I'm beginning with the move, please don't commit anything in the Orbitersdk diretory until I'm ready, I'll post here when it's finished!

Cheers
Tschachim
Logged

dseagrav
Moderator
Hero Member
****
Posts: 1118


View Profile
« Reply #12 on: February 11, 2009, 02:49:53 PM »

Is this still ongoing?

Logged
Tschachim
Project Apollo - NASSP
Administrator
Hero Member
*****
Posts: 3700


nassp.sf.net


View Profile WWW
« Reply #13 on: February 11, 2009, 02:51:23 PM »

Yep, I hope it's ready at the end of the week, sorry...
Logged

dseagrav
Moderator
Hero Member
****
Posts: 1118


View Profile
« Reply #14 on: February 11, 2009, 03:00:32 PM »

It's OK. I just had no idea how long it was going to take, so I asked. No rush.

Logged
Pages: [1] 2 3 Print 
« previous next »
Jump to:  

Powered by MySQL Powered by PHP Powered by SMF 1.1.10 | SMF © 2006-2009, Simple Machines LLC Valid XHTML 1.0! Valid CSS!