search

EmbodiedCognition / QtVR

Physics-based inverse kinematics (IK) and inverse dynamics (ID)
16 stars 12 forks source link

Move source code into subdirectories. #2

Closed lmjohns3 closed 11 years ago

lmjohns3 commented 11 years ago

I thought it was a bit cleaner to partition the code into subdirectories. Any thoughts ?

khouck commented 11 years ago

I merged your changes in once I got the code compile, but am currently working on getting the data file to load properly (and cleaning up the code a bit). Did you just move the file around, and will github merge things back in properly when I commit my changes? I don't want to commit broken code right now, but I will if I need to since it is no worse than what I checked out.

josephcooper commented 11 years ago

The code still works fine for me and it's quite a bit cleaner. I usually just work with the files through QtCreator, which organizes the files this way (visually) anyway.

khouck commented 11 years ago

So you're voting to rearrange the files? Or not bother? I want to know because I'm currently working on the code and will need to merge my changes into the new file structure.

-Kim Houck

josephcooper commented 11 years ago

I think the rearrangement is a good thing. jc

On Sat, Aug 24, 2013 at 12:28 AM, khouck notifications@github.com wrote:

So you're voting to rearrange the files? Or not bother? I want to know because I'm currently working on the code and will need to merge my changes into the new file structure.

-Kim Houck

— Reply to this email directly or view it on GitHubhttps://github.com/EmbodiedCognition/QtVR/pull/2#issuecomment-23203348 .

lmjohns3 commented 11 years ago

I like the rearrangement, too (hopefully that's not too surprising). As far as merging goes with your edits, Kim, I'm not sure how well git will do, but in my limited experience, git is surprisingly good at handling local file renames, even when the renamed files have changed in content as well.

khouck commented 11 years ago

I'm going to go ahead an merge this, hopefully git will merge my changes in correctly once I get things working on Linux.