Another bug bits the dust

galek · Dec 13, 2009 · 16c8689 · 16c8689
1 parent e2b3512
commit 16c8689
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 278 deletions.
diff --git a/Samples/Simple/Demo_Simple.vcproj b/Samples/Simple/Demo_Simple.vcproj
@@ -18,8 +18,8 @@
  <Configurations>
  <Configuration
  Name="Debug|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="../../bin/$(ConfigurationName)"
+ IntermediateDirectory="../../obj/$(ConfigurationName)"
  ConfigurationType="1"
  CharacterSet="1"
  >
@@ -61,9 +61,9 @@
  />
  <Tool
  Name="VCLinkerTool"
- AdditionalDependencies="ShinyDebug.lib"
+ AdditionalDependencies="Shiny.lib"
  LinkIncremental="2"
- AdditionalLibraryDirectories="../../lib"
+ AdditionalLibraryDirectories="../../lib/$(ConfigurationName)"
  GenerateDebugInformation="true"
  SubSystem="1"
  TargetMachine="1"
@@ -92,8 +92,8 @@
  </Configuration>
  <Configuration
  Name="Release|Win32"
- OutputDirectory="$(SolutionDir)$(ConfigurationName)"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="../../bin/$(ConfigurationName)"
+ IntermediateDirectory="../../obj/$(ConfigurationName)"
  ConfigurationType="1"
  CharacterSet="1"
  WholeProgramOptimization="1"
@@ -138,7 +138,7 @@
  Name="VCLinkerTool"
  AdditionalDependencies="Shiny.lib"
  LinkIncremental="1"
- AdditionalLibraryDirectories="../../lib"
+ AdditionalLibraryDirectories="../../lib/$(ConfigurationName)"
  GenerateDebugInformation="true"
  SubSystem="1"
  OptimizeReferences="2"

diff --git a/Shiny_vs2008.sln → Shiny.sln b/Shiny_vs2008.sln → Shiny.sln
@@ -1,7 +1,12 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shiny", "src\Shiny_vs2008.vcproj", "{D44CCFEB-7FC2-46E6-8290-E0B00D06A636}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shiny", "src\Shiny.vcproj", "{D44CCFEB-7FC2-46E6-8290-E0B00D06A636}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Demo_Simple", "Samples\Simple\Demo_Simple.vcproj", "{CE0B3567-5D70-4AA4-8F7C-29FE8E9CA7A3}"
+ ProjectSection(ProjectDependencies) = postProject
+ {D44CCFEB-7FC2-46E6-8290-E0B00D06A636} = {D44CCFEB-7FC2-46E6-8290-E0B00D06A636}
+ EndProjectSection
 EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,6 +18,10 @@ Global
  {D44CCFEB-7FC2-46E6-8290-E0B00D06A636}.Debug|Win32.Build.0 = Debug|Win32
  {D44CCFEB-7FC2-46E6-8290-E0B00D06A636}.Release|Win32.ActiveCfg = Release|Win32
  {D44CCFEB-7FC2-46E6-8290-E0B00D06A636}.Release|Win32.Build.0 = Release|Win32
+ {CE0B3567-5D70-4AA4-8F7C-29FE8E9CA7A3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CE0B3567-5D70-4AA4-8F7C-29FE8E9CA7A3}.Debug|Win32.Build.0 = Debug|Win32
+ {CE0B3567-5D70-4AA4-8F7C-29FE8E9CA7A3}.Release|Win32.ActiveCfg = Release|Win32
+ {CE0B3567-5D70-4AA4-8F7C-29FE8E9CA7A3}.Release|Win32.Build.0 = Release|Win32
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE

diff --git a/include/ShinyNode.h b/include/ShinyNode.h
@@ -85,7 +85,7 @@ SHINY_INLINE void ShinyNode_init(ShinyNode* self, ShinyNode* a_parent, struct _S
 }
 
 void ShinyNode_updateTree(ShinyNode* self, float a_damping);
-void ShinyNode_updateTreeSimple(ShinyNode* self);
+void ShinyNode_updateTreeClean(ShinyNode* self);
 
 SHINY_INLINE void ShinyNode_destroy(ShinyNode* self) {
  *(self->_cache) = &_ShinyNode_dummy;

diff --git a/include/ShinyNodeState.h b/include/ShinyNodeState.h
@@ -45,7 +45,7 @@ ShinyNodeState* ShinyNodeState_push(ShinyNodeState *a_top, ShinyNode *a_node);
 ShinyNodeState* ShinyNodeState_pop(ShinyNodeState *a_top);
 
 ShinyNode* ShinyNodeState_finishAndGetNext(ShinyNodeState *self, float a_damping);
-ShinyNode* ShinyNodeState_finishAndGetNextSimple(ShinyNodeState *self);
+ShinyNode* ShinyNodeState_finishAndGetNextClean(ShinyNodeState *self);
 
 #endif // if SHINY_COMPILED == TRUE
 

diff --git a/include/ShinyZone.h b/include/ShinyZone.h
@@ -61,7 +61,7 @@ SHINY_INLINE void ShinyZone_uninit(ShinyZone *self) {
 
 void ShinyZone_preUpdateChain(ShinyZone *first);
 void ShinyZone_updateChain(ShinyZone *first, float a_damping);
-void ShinyZone_updateChainSimple(ShinyZone *first);
+void ShinyZone_updateChainClean(ShinyZone *first);
 
 void ShinyZone_resetChain(ShinyZone *first);
 

diff --git a/src/Shiny.vcproj b/src/Shiny.vcproj
@@ -18,8 +18,8 @@
  <Configurations>
  <Configuration
  Name="Debug|Win32"
- OutputDirectory="../Lib"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="../lib/$(ConfigurationName)"
+ IntermediateDirectory="../obj/$(ConfigurationName)"
  ConfigurationType="4"
  CharacterSet="1"
  >
@@ -62,7 +62,7 @@
  />
  <Tool
  Name="VCLibrarianTool"
- OutputFile="$(OutDir)\$(ProjectName)Debug.lib"
+ OutputFile="$(OutDir)\$(ProjectName).lib"
  />
  <Tool
  Name="VCALinkTool"
@@ -82,8 +82,8 @@
  </Configuration>
  <Configuration
  Name="Release|Win32"
- OutputDirectory="../Lib"
- IntermediateDirectory="$(ConfigurationName)"
+ OutputDirectory="../lib/$(ConfigurationName)"
+ IntermediateDirectory="../obj/$(ConfigurationName)"
  ConfigurationType="4"
  CharacterSet="1"
  WholeProgramOptimization="1"
@@ -124,6 +124,7 @@
  />
  <Tool
  Name="VCLibrarianTool"
+ OutputFile="$(OutDir)\$(ProjectName).lib"
  />
  <Tool
  Name="VCALinkTool"

diff --git a/src/ShinyManager.c b/src/ShinyManager.c
@@ -131,8 +131,8 @@ void ShinyManager_update(ShinyManager *self) {
 
  if (self->_firstUpdate || self->damping == 0) {
  self->_firstUpdate = FALSE;
- ShinyNode_updateTreeSimple(&self->rootNode);
- ShinyZone_updateChainSimple(&self->rootZone);
+ ShinyNode_updateTreeClean(&self->rootNode);
+ ShinyZone_updateChainClean(&self->rootZone);
 
  } else {
  ShinyNode_updateTree(&self->rootNode, self->damping);

diff --git a/src/ShinyNode.c b/src/ShinyNode.c
@@ -67,7 +67,7 @@ void ShinyNode_updateTree(ShinyNode* first, float a_damping) {
 
 //-----------------------------------------------------------------------------
 
-void ShinyNode_updateTreeSimple(ShinyNode* first) {
+void ShinyNode_updateTreeClean(ShinyNode* first) {
  ShinyNodeState *top = NULL;
  ShinyNode *node = first;
 
@@ -78,7 +78,7 @@ void ShinyNode_updateTreeSimple(ShinyNode* first) {
  } while (node);
 
  for (;;) {
- node = ShinyNodeState_finishAndGetNextSimple(top);
+ node = ShinyNodeState_finishAndGetNextClean(top);
  top = ShinyNodeState_pop(top);
 
  if (node) break;

diff --git a/src/ShinyNodeState.c b/src/ShinyNodeState.c
@@ -48,7 +48,7 @@ ShinyNodeState* ShinyNodeState_push(ShinyNodeState *a_top, ShinyNode *a_node) {
  a_node->_last.selfTicks = 0;
  a_node->_last.entryCount = 0;
 
- self->zoneUpdating = a_node->zone->_state != SHINY_ZONE_STATE_UPDATING;
+ self->zoneUpdating = zone->_state != SHINY_ZONE_STATE_UPDATING;
  if (self->zoneUpdating) {
  zone->_state = SHINY_ZONE_STATE_UPDATING;
  } else {
@@ -73,34 +73,34 @@ ShinyNode* ShinyNodeState_finishAndGetNext(ShinyNodeState *self, float a_damping
  ShinyZone *zone = node->zone;
 
  if (self->zoneUpdating) { 
- zone->data.childTicks.cur += zone->data.childTicks.cur;
+ zone->data.childTicks.cur += node->data.childTicks.cur;
  zone->_state = SHINY_ZONE_STATE_INITIALIZED;
  }
 
- ShinyData_computeAverage(&(zone->data), a_damping);
+ ShinyData_computeAverage(&node->data, a_damping);
 
  if (!ShinyNode_isRoot(node))
- node->parent->data.childTicks.cur += zone->data.selfTicks.cur + zone->data.childTicks.cur;
+ node->parent->data.childTicks.cur += node->data.selfTicks.cur + node->data.childTicks.cur;
 
  return node->nextSibling;
 }
 
 
 //-----------------------------------------------------------------------------
 
-ShinyNode* ShinyNodeState_finishAndGetNextSimple(ShinyNodeState *self) {
+ShinyNode* ShinyNodeState_finishAndGetNextClean(ShinyNodeState *self) {
  ShinyNode *node = self->node;
  ShinyZone *zone = node->zone;
 
  if (self->zoneUpdating) { 
- zone->data.childTicks.cur += zone->data.childTicks.cur;
+ zone->data.childTicks.cur += node->data.childTicks.cur;
  zone->_state = SHINY_ZONE_STATE_INITIALIZED;
  }
 
- ShinyData_copyAverage(&(zone->data));
+ ShinyData_copyAverage(&node->data);
 
  if (!ShinyNode_isRoot(node))
- node->parent->data.childTicks.cur += zone->data.selfTicks.cur + zone->data.childTicks.cur;
+ node->parent->data.childTicks.cur += node->data.selfTicks.cur + node->data.childTicks.cur;
 
  return node->nextSibling;
 }

diff --git a/src/ShinyZone.c b/src/ShinyZone.c
@@ -53,7 +53,7 @@ void ShinyZone_updateChain(ShinyZone *first, float a_damping) {
 
 //-----------------------------------------------------------------------------
 
-void ShinyZone_updateChainSimple(ShinyZone *first) {
+void ShinyZone_updateChainClean(ShinyZone *first) {
  ShinyZone* zone = first;
 
  do {