Changeset 932 for cpp/frams/neuro/neuroimpl.h

Timestamp:

05/28/20 18:00:45 (5 years ago)

Author:

Maciej Komosinski

Message:

Neuron classes now have a property (a bit field) that says whether each neuron class supports model shape BALL_AND_STICK, SOLIDS, or both

File:

• cpp/frams/neuro/neuroimpl.h (modified) (4 diffs)

cpp/frams/neuro/neuroimpl.h

@@ -1 +1 @@
 // This file is a part of Framsticks SDK.  http://www.framsticks.com/
-// Copyright (C) 1999-2018  Maciej Komosinski and Szymon Ulatowski.
+// Copyright (C) 1999-2020  Maciej Komosinski and Szymon Ulatowski.
 // See LICENSE.txt for details.
 
@@ -82 +82 @@
                 , ChannelSpace *ch = 0
 #endif
-                );
+        );
         ~NeuroNetImpl();
         void simulateNeuroNet();
@@ -223 +223 @@
         virtual int lateinit() { return 1; }
         /** calculate 'newstate - implementation dependent */
-        virtual void go(){}
+        virtual void go() {}
         /** for neurons doing some physical actions (called each simulation step when nnspeed!=1.0) */
-        virtual void goPhysics(){}
+        virtual void goPhysics() {}
 
         int getSimOrder() { return simorder; }
@@ -287 +287 @@
         PARAMGETDEF(cstate) { arg1->setDouble(neuro->state); }
         PARAMSETDEF(cstate) { setCurrentState(arg1->getDouble()); return 0; }
-        PARAMGETDEF(hold) { arg1->setInt((neuro->flags&(Neuro::HoldState)) ? 1 : 0); }
-        PARAMSETDEF(hold) { neuro->flags = (neuro->flags&~Neuro::HoldState) | (arg1->getInt() ? Neuro::HoldState : 0); return 0; }
+        PARAMGETDEF(hold) { arg1->setInt((neuro->flags & (Neuro::HoldState)) ? 1 : 0); }
+        PARAMSETDEF(hold) { neuro->flags = (neuro->flags & ~Neuro::HoldState) | (arg1->getInt() ? Neuro::HoldState : 0); return 0; }
         PARAMGETDEF(channels) { arg1->setInt(getChannelCount()); }
         PARAMSETDEF(channels) { setChannelCount(arg1->getInt()); return 0; }