Skip to content

Commit

Permalink
Tool-1 : Merge jasonrohrer/OneLife
Browse files Browse the repository at this point in the history 
- Update Tool-1\Source_Original\
————
- 更新 Tool-1\Source_Original\
  • Loading branch information
@is52hertz
is52hertz committed Feb 11, 2024
1 parent 318ee36 commit 1dfc5e3
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 17 deletions.
2 changes: 2 additions & 0 deletions Tool-1/Source_Original/EditorAnimationPage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -705,6 +705,8 @@ static AnimationRecord *createRecordForObject( int inObjectID,
zeroRecord( &( r->slotAnim[j] ) );
}

r->authorTag = NULL;

return r;
}

Expand Down
20 changes: 10 additions & 10 deletions Tool-1/Source_Original/EditorObjectPage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,30 +87,30 @@ EditorObjectPage::EditorObjectPage()
mContainSizeField( smallFont,
250, -120, 4,
false,
"Contain Size", "0123456789.", NULL ),
"ContainSize", "0123456789.", NULL ),
mSlotSizeField( smallFont,
-280, -230, 4,
false,
"Slot Size", "0123456789.", NULL ),
"SlotSize", "0123456789.", NULL ),
mSlotTimeStretchField( smallFont,
-155, -110, 4,
false,
"Tm Strch", "0123456789.", NULL ),
"TmStrch", "0123456789.", NULL ),
mSlotsLockedCheckbox( -260, -200, 2 ),
mNoFlipCheckbox( 460, -260, 2 ),
mSideAccessCheckbox( 460, -240, 2 ),
mDeadlyDistanceField( smallFont,
150, -220, 4,
false,
"Deadly Distance", "0123456789", NULL ),
"DeadlyDistance", "0123456789", NULL ),
mUseDistanceField( smallFont,
150, -190, 4,
false,
"Use Dist", "0123456789", NULL ),
"UseDist", "0123456789", NULL ),
mMinPickupAgeField( smallFont,
300, -220, 4,
false,
"Pickup Age", "0123456789.", NULL ),
"PickupAge", "0123456789.", NULL ),
mRaceField( smallFont,
150, -120, 2,
true,
Expand Down Expand Up @@ -173,7 +173,7 @@ EditorObjectPage::EditorObjectPage()
mNumUsesField( smallFont,
258, 110, 2,
false,
"# Use", "0123456789", NULL ),
"#Use", "0123456789", NULL ),
mUseChanceField( smallFont,
300, 110, 4,
false,
Expand Down Expand Up @@ -4143,12 +4143,12 @@ void EditorObjectPage::draw( doublePair inViewCenter,
if( mNoFlipCheckbox.isVisible() ) {
pos = mNoFlipCheckbox.getPosition();
pos.x -= checkboxSep;
smallFont->drawString( "No Flip", pos, alignRight );
smallFont->drawString( "NoFlip", pos, alignRight );
}
if( mSideAccessCheckbox.isVisible() ) {
pos = mSideAccessCheckbox.getPosition();
pos.x -= checkboxSep;
smallFont->drawString( "Side Access", pos, alignRight );
smallFont->drawString( "SideAccess", pos, alignRight );
}


Expand Down Expand Up @@ -4222,7 +4222,7 @@ void EditorObjectPage::draw( doublePair inViewCenter,
if( mFloorHuggingCheckbox.isVisible() ) {
pos = mFloorHuggingCheckbox.getPosition();
pos.x -= checkboxSep;
smallFont->drawString( "Hug Floor", pos, alignRight );
smallFont->drawString( "HugFloor", pos, alignRight );
}


Expand Down
75 changes: 68 additions & 7 deletions Tool-1/Source_Original/editor.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
int versionNumber = 406;
int versionNumber = 409;



Expand Down Expand Up @@ -1171,6 +1171,67 @@ void drawFrame( char inUpdate ) {

loadingPhaseStartTime = Time::getCurrentTime();

int numBlocks = initImportAddStart();
loadingPage->setCurrentPhase( "IMPORT ADD" );
loadingPage->setCurrentProgress( 0 );


loadingStepBatchSize = numBlocks / 20;

if( loadingStepBatchSize < 1 ) {
loadingStepBatchSize = 1;
}

loadingPhase ++;
}
break;
}
case 3: {
float progress;
for( int i=0; i<loadingStepBatchSize; i++ ) {
progress = initImportAddStep();
loadingPage->setCurrentProgress( progress );
}

if( progress == 1.0 ) {
initImportAddFinish();

printf( "Finished import add in %f sec\n",
Time::getCurrentTime() -
loadingPhaseStartTime );

loadingPhaseStartTime = Time::getCurrentTime();

int numBlocks = initImportReplaceStart();
loadingPage->setCurrentPhase( "IMPORT REPLACE" );
loadingPage->setCurrentProgress( 0 );


loadingStepBatchSize = numBlocks / 20;

if( loadingStepBatchSize < 1 ) {
loadingStepBatchSize = 1;
}

loadingPhase ++;
}
break;
}
case 4: {
float progress;
for( int i=0; i<loadingStepBatchSize; i++ ) {
progress = initImportReplaceStep();
loadingPage->setCurrentProgress( progress );
}

if( progress == 1.0 ) {
initImportReplaceFinish();

printf( "Finished import replace in %f sec\n",
Time::getCurrentTime() -
loadingPhaseStartTime );

loadingPhaseStartTime = Time::getCurrentTime();

char rebuilding;

Expand All @@ -1197,7 +1258,7 @@ void drawFrame( char inUpdate ) {
}
break;
}
case 3: {
case 5: {
float progress;
for( int i=0; i<loadingStepBatchSize; i++ ) {
progress = initAnimationBankStep();
Expand Down Expand Up @@ -1239,7 +1300,7 @@ void drawFrame( char inUpdate ) {
}
break;
}
case 4: {
case 6: {
float progress;
for( int i=0; i<loadingStepBatchSize; i++ ) {
progress = initObjectBankStep();
Expand Down Expand Up @@ -1269,7 +1330,7 @@ void drawFrame( char inUpdate ) {
}
break;
}
case 5: {
case 7: {
float progress;
for( int i=0; i<loadingStepBatchSize; i++ ) {
progress = initModLoaderStep();
Expand Down Expand Up @@ -1313,7 +1374,7 @@ void drawFrame( char inUpdate ) {
}
break;
}
case 6: {
case 8: {
float progress;
for( int i=0; i<loadingStepBatchSize; i++ ) {
progress = initCategoryBankStep();
Expand Down Expand Up @@ -1357,7 +1418,7 @@ void drawFrame( char inUpdate ) {
}
break;
}
case 7: {
case 9: {
float progress;
for( int i=0; i<loadingStepBatchSize; i++ ) {
progress = initTransBankStep();
Expand All @@ -1380,7 +1441,7 @@ void drawFrame( char inUpdate ) {
}
break;
}
case 8: {
case 10: {
float progress;
for( int i=0; i<loadingStepBatchSize; i++ ) {
progress = initGroundSpritesStep();
Expand Down

0 comments on commit 1dfc5e3

Please sign in to comment.